[Pkg-gnutls-commits] r1148 - in /packages/p11-kit/trunk/debian: changelog control libp11-kit-dev.install libp11-kit0.install rules

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Aug  7 10:01:57 2011
New Revision: 1148

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1148
Log:
Convert to multi-arch

Modified:
    packages/p11-kit/trunk/debian/changelog
    packages/p11-kit/trunk/debian/control
    packages/p11-kit/trunk/debian/libp11-kit-dev.install
    packages/p11-kit/trunk/debian/libp11-kit0.install
    packages/p11-kit/trunk/debian/rules

Modified: packages/p11-kit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/changelog?rev=1148&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/changelog (original)
+++ packages/p11-kit/trunk/debian/changelog Sun Aug  7 10:01:57 2011
@@ -3,6 +3,13 @@
   * Upload to Debian.
   * Add watch file.
   * Add info for p11-kit/pkcs11.h to debian/copyright.
+  * Convert to multi-arch:
+   + configure with --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH), update
+     *.install accordingly.
+   + Bump debhelper b-d to 8.1.3 (for ${misc:Pre-Depends}).
+   + runtime library is Multi-Arch: same with Pre-Depends:
+     ${misc:Pre-Depends}, -bin is Multi-Arch: foreign, -dev remains
+     unchanged.
 
  -- Andreas Metzler <ametzler at debian.org>  Sun, 07 Aug 2011 10:50:03 +0200
 

Modified: packages/p11-kit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/control?rev=1148&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/control (original)
+++ packages/p11-kit/trunk/debian/control Sun Aug  7 10:01:57 2011
@@ -2,7 +2,7 @@
 Priority: extra
 Maintainer: Debian GnuTLS Maintainers <pkg-gnutls-maint at lists.alioth.debian.org>
 Uploaders: Andreas Metzler <ametzler at debian.org>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev
+Build-Depends: debhelper (>= 8.1.3), autotools-dev
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://p11-glue.freedesktop.org/p11-kit.html
@@ -25,7 +25,9 @@
 Package: libp11-kit0
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Library for loading and coordinating access to PKCS#11 modules - runtime
  Provides a way to load and enumerate PKCS#11 modules. Provides a standard
  configuration setup for installing PKCS#11 modules in such a way that
@@ -41,6 +43,7 @@
 Section: misc
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: foreign
 Description: Utilities for working with the p11-glue library
  Provides a way to load and enumerate PKCS#11 modules. Provides a standard
  configuration setup for installing PKCS#11 modules in such a way that

Modified: packages/p11-kit/trunk/debian/libp11-kit-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/libp11-kit-dev.install?rev=1148&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/libp11-kit-dev.install (original)
+++ packages/p11-kit/trunk/debian/libp11-kit-dev.install Sun Aug  7 10:01:57 2011
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/share/gtk-doc/*

Modified: packages/p11-kit/trunk/debian/libp11-kit0.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/libp11-kit0.install?rev=1148&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/libp11-kit0.install (original)
+++ packages/p11-kit/trunk/debian/libp11-kit0.install Sun Aug  7 10:01:57 2011
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Modified: packages/p11-kit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/rules?rev=1148&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/rules (original)
+++ packages/p11-kit/trunk/debian/rules Sun Aug  7 10:01:57 2011
@@ -1,7 +1,12 @@
 #!/usr/bin/make -f
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+override_dh_auto_configure:
+	dh_auto_configure -- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
 %:
 	dh $@