[Pkg-gnutls-commits] r1120 - in /packages/libgcrypt11/branches/branch1.5/debian: changelog control libgcrypt11-dev.install libgcrypt11-dev.links libgcrypt11-udeb.install libgcrypt11.install rules

ametzler at users.alioth.debian.org ametzler at users.alioth.debian.org
Wed Jun 29 18:08:50 UTC 2011 

Author: ametzler
Date: Wed Jun 29 18:08:49 2011
New Revision: 1120

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1120
Log:
Merge multi-arch changes (1.4.6-6 and 1.4.6-7), drop libtool la file.

Removed:
    packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11-dev.links
Modified:
    packages/libgcrypt11/branches/branch1.5/debian/changelog
    packages/libgcrypt11/branches/branch1.5/debian/control
    packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11-dev.install
    packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11-udeb.install
    packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11.install
    packages/libgcrypt11/branches/branch1.5/debian/rules

Modified: packages/libgcrypt11/branches/branch1.5/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.5/debian/changelog?rev=1120&op=diff
==============================================================================
--- packages/libgcrypt11/branches/branch1.5/debian/changelog (original)
+++ packages/libgcrypt11/branches/branch1.5/debian/changelog Wed Jun 29 18:08:49 2011
@@ -1,6 +1,7 @@
 libgcrypt11 (1.5.0~beta1-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Merge multi-arch changes (1.4.6-6 and 1.4.6-7), drop libtool la file.
 
  -- Andreas Metzler <ametzler at debian.org>  Sat, 26 Feb 2011 19:45:54 +0100
 
@@ -15,6 +16,30 @@
     seem to set it by default.
 
  -- Andreas Metzler <ametzler at debian.org>  Sat, 26 Feb 2011 19:34:14 +0100
+
+libgcrypt11 (1.4.6-7) unstable; urgency=low
+
+  * Do not use multiarch path in udeb. (Thanks, Colin Watson)
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 25 Jun 2011 19:21:16 +0200
+
+libgcrypt11 (1.4.6-6) unstable; urgency=low
+
+  * Stop shipping libtool la file. This should take care of LP: #751142
+  * Convert to multi-arch.
+    + configure with --libdir=/lib/$(DEB_HOST_MULTIARCH), update
+      *.install accordingly.
+    + Bump cdbs Build-Depends to 0.4.93 (required for expanding 
+      $(DEB_HOST_MULTIARCH)).
+    + Bump debhelper b-d to 8.1.3 (for ${misc:Pre-Depends}).
+    + runtime library is Multi-Arch: same and has Pre-Depends: 
+      ${misc:Pre-Depends}.
+    + This is based on 1.4.6-5ubuntu1, however some differences remain. -dbg
+      package is not Multi-Arch: same (Due to usr/lib/debug/usr/bin/*). We
+      ship the so-symlink in /lib/$(DEB_HOST_MULTIARCH) instead of
+      /usr/lib/$(DEB_HOST_MULTIARCH). 
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 25 Jun 2011 17:52:12 +0200
 
 libgcrypt11 (1.4.6-5) unstable; urgency=low
 

Modified: packages/libgcrypt11/branches/branch1.5/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.5/debian/control?rev=1120&op=diff
==============================================================================
--- packages/libgcrypt11/branches/branch1.5/debian/control (original)
+++ packages/libgcrypt11/branches/branch1.5/debian/control Wed Jun 29 18:08:49 2011
@@ -5,10 +5,10 @@
 Uploaders: Andreas Metzler <ametzler at debian.org>, 
  Eric Dorland <eric at debian.org>, James Westby <jw+debian at jameswestby.net>,
  Simon Josefsson <simon at josefsson.org>
-Build-Depends: debhelper (>> 7.0.14), texlive-latex-base,
- texlive-generic-recommended, texinfo (>= 4.6-0), cdbs (>= 0.4.53),
+Build-Depends: debhelper (>> 8.1.3), texlive-latex-base,
+ texlive-generic-recommended, texinfo (>= 4.6-0), cdbs (>= 0.4.93),
  libgpg-error-dev (>> 1.10-0.1), autotools-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnutls/packages/libgcrypt11/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/
 Homepage: http://directory.fsf.org/project/libgcrypt/
@@ -67,6 +67,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: rng-tools
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: LGPL Crypto library - runtime library
  libgcrypt contains cryptographic functions.  Many important free
  ciphers, hash algorithms and public key signing algorithms have been

Modified: packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11-dev.install?rev=1120&op=diff
==============================================================================
--- packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11-dev.install (original)
+++ packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11-dev.install Wed Jun 29 18:08:49 2011
@@ -1,6 +1,5 @@
-debian/tmp/usr/include/* usr/include
-debian/tmp/lib/lib*.a lib
-debian/tmp/lib/lib*.la usr/lib
-debian/tmp/lib/lib*.so lib
-debian/tmp/usr/bin/* usr/bin
-debian/tmp/usr/share/aclocal/* usr/share/aclocal
+debian/tmp/usr/include/*
+debian/tmp/lib/*/lib*.a
+debian/tmp/lib/*/lib*.so
+debian/tmp/usr/bin/*
+debian/tmp/usr/share/aclocal/*

Modified: packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11-udeb.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11-udeb.install?rev=1120&op=diff
==============================================================================
--- packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11-udeb.install (original)
+++ packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11-udeb.install Wed Jun 29 18:08:49 2011
@@ -1,1 +1,1 @@
-debian/tmp/lib/lib*.so.* lib
+debian/tmp/lib/*/lib*.so.* lib

Modified: packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11.install?rev=1120&op=diff
==============================================================================
--- packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11.install (original)
+++ packages/libgcrypt11/branches/branch1.5/debian/libgcrypt11.install Wed Jun 29 18:08:49 2011
@@ -1,1 +1,1 @@
-debian/tmp/lib/lib*.so.* lib
+debian/tmp/lib/*/lib*.so.*

Modified: packages/libgcrypt11/branches/branch1.5/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/branches/branch1.5/debian/rules?rev=1120&op=diff
==============================================================================
--- packages/libgcrypt11/branches/branch1.5/debian/rules (original)
+++ packages/libgcrypt11/branches/branch1.5/debian/rules Wed Jun 29 18:08:49 2011
@@ -6,7 +6,8 @@
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-noexecstack \
-	--enable-ld-version-script --libdir=/lib --enable-static
+	--enable-ld-version-script --enable-static \
+	--libdir=/lib/$(DEB_HOST_MULTIARCH)
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 DEB_MAKE_CHECK_TARGET = check
 endif
@@ -35,7 +36,3 @@
 build/libgcrypt11-doc:: $(DEB_BUILDDIR)/config.status
 	cd $(DEB_SRCDIR)/doc && $(MAKE) gcrypt.ps html
 
-install/libgcrypt11-dev::
-	find debian/tmp/lib -name "*.la" -exec \
-		sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} +
-

More information about the Pkg-gnutls-commits mailing list