[pkg-opensc-commit] [SCM] pam-p11 packaging branch, master, updated. 0cbb4cf2d54dc4f6e03cbc0ce81eaa46f00d8815

[Eric Dorland]

The following commit has been merged in the master branch:
commit 063ca7120319c1128ba11666a81724d6f9b763be
Author: Eric Dorland <eric at debian.org>
Date:   Sat Mar 10 21:06:12 2012 -0500

    debian/control, debian/rules: Multi-Arch enable package.

diff --git a/debian/changelog b/debian/changelog
index 71e1b26..20561b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ pam-p11 (0.1.5-2) unstable; urgency=low
   * debian/compat, debian/control, debian/rules: Convert to debhelper 9
     and drop cdbs.
   * debian/control: Upgrade Standards-Version to 3.9.3.
+  * debian/control, debian/rules: Multi-Arch enable package.
 
- --
+ -- Eric Dorland <eric at debian.org>  Sat, 10 Mar 2012 21:05:34 -0500
 
 pam-p11 (0.1.5-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index bc2ac94..355d3c4 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-opensc/pam-p11.git
 
 Package: libpam-p11
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libpam-opensc
 Replaces: libpam-opensc
diff --git a/debian/rules b/debian/rules
index a7b30e8..7610171 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,12 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --libdir=/lib
+	dh_auto_configure -- --libdir=/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_installchangelogs:
 	dh_installchangelogs doc/Changelog

-- 
pam-p11 packaging