[Pkg-gnutls-commits] r1113 - in /packages/gnutls26/branches/branch2.11.x/debian: changelog guile-gnutls.install libgnutls-dev.install libgnutls-openssl27.install libgnutls26.install libgnutlsxx27.install rules

ametzler at users.alioth.debian.org ametzler at users.alioth.debian.org
Sun Jun 26 11:04:23 UTC 2011


Author: ametzler
Date: Sun Jun 26 11:04:23 2011
New Revision: 1113

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1113
Log:
configure with --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH), update *.install
accordingly

Modified:
    packages/gnutls26/branches/branch2.11.x/debian/changelog
    packages/gnutls26/branches/branch2.11.x/debian/guile-gnutls.install
    packages/gnutls26/branches/branch2.11.x/debian/libgnutls-dev.install
    packages/gnutls26/branches/branch2.11.x/debian/libgnutls-openssl27.install
    packages/gnutls26/branches/branch2.11.x/debian/libgnutls26.install
    packages/gnutls26/branches/branch2.11.x/debian/libgnutlsxx27.install
    packages/gnutls26/branches/branch2.11.x/debian/rules

Modified: packages/gnutls26/branches/branch2.11.x/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/changelog?rev=1113&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/changelog (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/changelog Sun Jun 26 11:04:23 2011
@@ -2,6 +2,9 @@
 
   * NOT RELEASED YET
   * Stop shipping libtool la files.
+  * Convert to multi-arch. (Partial merge from Ubuntu 2.10.5-1ubuntu2):
+    + configure with --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH), update
+      *.install accordingly.
 
  -- Andreas Metzler <ametzler at debian.org>  Sun, 19 Jun 2011 09:16:30 +0200
 

Modified: packages/gnutls26/branches/branch2.11.x/debian/guile-gnutls.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/guile-gnutls.install?rev=1113&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/guile-gnutls.install (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/guile-gnutls.install Sun Jun 26 11:04:23 2011
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libguile-gnutls*.so* usr/lib
-debian/tmp/usr/share/guile/site usr/share/guile
+debian/tmp/usr/lib/*/libguile-gnutls*.so*
+debian/tmp/usr/share/guile/site

Modified: packages/gnutls26/branches/branch2.11.x/debian/libgnutls-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/libgnutls-dev.install?rev=1113&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/libgnutls-dev.install (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/libgnutls-dev.install Sun Jun 26 11:04:23 2011
@@ -1,6 +1,6 @@
-debian/tmp/usr/include/* usr/include
-debian/tmp/usr/lib/libgnutls*.so usr/lib
-debian/tmp/usr/lib/libgnutls*.a usr/lib
-debian/tmp/usr/lib/pkgconfig/gnutls.pc usr/lib/pkgconfig
-debian/tmp/usr/lib/pkgconfig/gnutls-extra.pc usr/lib/pkgconfig
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/*/libgnutls*.so
+debian/tmp/usr/lib/*/libgnutls*.a
+debian/tmp/usr/lib/*/pkgconfig/gnutls.pc
+debian/tmp/usr/lib/*/pkgconfig/gnutls-extra.pc
 

Modified: packages/gnutls26/branches/branch2.11.x/debian/libgnutls-openssl27.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/libgnutls-openssl27.install?rev=1113&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/libgnutls-openssl27.install (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/libgnutls-openssl27.install Sun Jun 26 11:04:23 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libgnutls-openssl.so.* usr/lib
+debian/tmp/usr/lib/*/libgnutls-openssl.so.*

Modified: packages/gnutls26/branches/branch2.11.x/debian/libgnutls26.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/libgnutls26.install?rev=1113&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/libgnutls26.install (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/libgnutls26.install Sun Jun 26 11:04:23 2011
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libgnutls.so.* usr/lib
-debian/tmp/usr/lib/libgnutls-e*.so.* usr/lib
-debian/tmp/usr/share/locale/* /usr/share/locale
+debian/tmp/usr/lib/*/libgnutls.so.*
+debian/tmp/usr/lib/*/libgnutls-e*.so.*
+debian/tmp/usr/share/locale/*

Modified: packages/gnutls26/branches/branch2.11.x/debian/libgnutlsxx27.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/libgnutlsxx27.install?rev=1113&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/libgnutlsxx27.install (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/libgnutlsxx27.install Sun Jun 26 11:04:23 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libgnutlsxx.so.* usr/lib
+debian/tmp/usr/lib/*/libgnutlsxx.so.*

Modified: packages/gnutls26/branches/branch2.11.x/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/rules?rev=1113&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/rules (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/rules Sun Jun 26 11:04:23 2011
@@ -4,7 +4,14 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --enable-cxx --without-lzo --enable-guile --with-guile-site-dir=/usr/share/guile/site --cache-file=$(CURDIR)/config.cache --with-libgcrypt --with-packager=Debian --with-packager-bug-reports=http://bugs.debian.org.org/ --with-packager-version="$(DEB_VERSION)"
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --enable-cxx \
+	--without-lzo --enable-guile \
+	--with-guile-site-dir=/usr/share/guile/site \
+	--cache-file=$(CURDIR)/config.cache --with-libgcrypt \
+	--with-packager=Debian \
+	--with-packager-bug-reports=http://bugs.debian.org.org/ \
+	--with-packager-version="$(DEB_VERSION)" \
+	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 DEB_MAKE_CHECK_TARGET = check
 DEB_DH_MAKESHLIBS_ARGS_libgnutls26 := -V 'libgnutls26 (>= 2.12.6.1-0)'
 DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -V 'guile-gnutls (>= 2.12.6.1-0)'




More information about the Pkg-gnutls-commits mailing list