build Debian packages with multiarch support

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1491 ef36b2f9-881f-0410-afb5-c4e39611909c

9 files changed, 21 insertions, 18 deletions

diff --git a/Makefile.am b/Makefile.am
index 61ea1f1..2301aca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ SUBDIRS += man tests
 
 DEBIAN_FILES = debian/changelog debian/compat debian/control \
                debian/copyright debian/rules debian/NEWS \
-               debian/source/format \
+               debian/source/format debian/source/lintian-overrides \
                debian/nslcd.conffile \
                debian/nslcd.config \
                debian/nslcd.default \
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 22d1cc6..c2fdf4e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Arthur de Jong <adejong@debian.org>
 Uploaders: Richard A Nelson (Rick) <cowboy@debian.org>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8), libkrb5-dev, libldap2-dev, libsasl2-dev, po-debconf (>= 0.5.0), docbook2x, docbook-xml, libpam0g-dev
+Build-Depends: debhelper (>= 8.1.3), libkrb5-dev, libldap2-dev, libsasl2-dev, po-debconf (>= 0.5.0), docbook2x, docbook-xml, libpam0g-dev
 Homepage: http://arthurdejong.org/nss-pam-ldapd/
 Vcs-Svn: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd/
 Vcs-Browser: http://arthurdejong.org/viewvc/nss-pam-ldapd/nss-pam-ldapd/
@@ -25,9 +25,11 @@ Description: Daemon for NSS and PAM lookups using LDAP
 
 Package: libnss-ldapd
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}, nslcd (>= 0.7.0)
 Conflicts: libnss-ldap
 Provides: libnss-ldap
+Multi-Arch: same
 Description: NSS module for using LDAP as a naming service
  This package provides a Name Service Switch module that allows your LDAP
  server to provide user account, group, host name, alias, netgroup, and
@@ -36,9 +38,11 @@ Description: NSS module for using LDAP as a naming service
 
 Package: libpam-ldapd
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}, nslcd, libpam-runtime (>= 1.0.1-6)
 Conflicts: libpam-ldap
 Provides: libpam-ldap
+Multi-Arch: same
 Description: PAM module for using LDAP as an authentication service
  This package provides a Pluggable Authentication Module that allows
  user authentication, authorisation and password management based on
diff --git a/debian/libnss-ldapd.install b/debian/libnss-ldapd.install
index 1560868..67d96c3 100644
--- a/debian/libnss-ldapd.install
+++ b/debian/libnss-ldapd.install
@@ -1 +1 @@
-lib/libnss_ldap.so*
+lib/*/libnss_ldap.so*
diff --git a/debian/libnss-ldapd.lintian-overrides b/debian/libnss-ldapd.lintian-overrides
index b707f3a..d9d17fa 100644
--- a/debian/libnss-ldapd.lintian-overrides
+++ b/debian/libnss-ldapd.lintian-overrides
@@ -1,5 +1,3 @@
-# we ship a shared library that is used for the NSS system
-# providing shlibs or symbols files is no use because nobody
-# should directly link to our library
-libnss-ldapd: no-shlibs-control-file lib/libnss_ldap.so.2
-libnss-ldapd: no-symbols-control-file lib/libnss_ldap.so.2
+# we ship a shared library that is used for the NSS system but providing
+# symbols files is no use because nobody should directly link to the library
+libnss-ldapd: no-symbols-control-file lib/*/libnss_ldap.so.2
diff --git a/debian/libnss-ldapd.postinst b/debian/libnss-ldapd.postinst
index 45d7f20..316a8e1 100644
--- a/debian/libnss-ldapd.postinst
+++ b/debian/libnss-ldapd.postinst
@@ -74,10 +74,6 @@ then
   done
   # we're done
   db_stop
-  # update the cache of the dynamic linker
-  # (we don't use dh_makeshlibs because that also installs a shlibs file
-  # which we don't need)
-  ldconfig
 fi
 
 #DEBHELPER#
diff --git a/debian/libpam-ldapd.install b/debian/libpam-ldapd.install
index b447a4f..5e7563c 100644
--- a/debian/libpam-ldapd.install
+++ b/debian/libpam-ldapd.install
@@ -1,2 +1,2 @@
-lib/security
+lib/*/security/pam_ldap.so
 debian/pam-configs/ldap usr/share/pam-configs
diff --git a/debian/rules b/debian/rules
index 530e008..b5747fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,17 +2,19 @@
 
 export DH_VERBOSE=1
 
+# multiarch support
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@
 
+# pass extra flags to configure
 override_dh_auto_configure:
 	dh_auto_configure -- \
-	            --libdir=/lib \
+	            --libdir=/lib/$(DEB_HOST_MULTIARCH) \
+	            --with-pam-seclib-dir=/lib/$(DEB_HOST_MULTIARCH)/security \
 	            --enable-warnings \
 	            --with-ldap-lib=openldap \
 	            --with-ldap-conf-file=/etc/nslcd.conf \
 	            --with-nslcd-pidfile=/var/run/nslcd/nslcd.pid \
 	            --with-nslcd-socket=/var/run/nslcd/socket
-
-override_dh_makeshlibs:
-	# do not generate shlibs (shared NSS library not meant to be linked)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..5389f68
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# we are building with multiarch support which requires a compatibility level
+# that is still open for development
+source: package-needs-versioned-debhelper-build-depends 9