nss-pam-ldapd commit: r1491 - in nss-pam-ldapd: . debian debian/source

[Date Prev][Date Next] [Thread Prev][Thread Next]

From: Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>
To: nss-pam-ldapd-commits [at] lists.arthurdejong.org
Reply-to: nss-pam-ldapd-users [at] lists.arthurdejong.org
Subject: nss-pam-ldapd commit: r1491 - in nss-pam-ldapd: . debian debian/source
Date: Sun, 7 Aug 2011 18:40:41 +0200 (CEST)

Author: arthur
Date: Sun Aug  7 18:40:40 2011
New Revision: 1491
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1491

Log:
build Debian packages with multiarch support

Added:
   nss-pam-ldapd/debian/source/lintian-overrides
Modified:
   nss-pam-ldapd/Makefile.am
   nss-pam-ldapd/debian/compat
   nss-pam-ldapd/debian/control
   nss-pam-ldapd/debian/libnss-ldapd.install
   nss-pam-ldapd/debian/libnss-ldapd.lintian-overrides
   nss-pam-ldapd/debian/libnss-ldapd.postinst
   nss-pam-ldapd/debian/libpam-ldapd.install
   nss-pam-ldapd/debian/rules

Modified: nss-pam-ldapd/Makefile.am
==============================================================================
--- nss-pam-ldapd/Makefile.am   Sun Aug  7 15:10:53 2011        (r1490)
+++ nss-pam-ldapd/Makefile.am   Sun Aug  7 18:40:40 2011        (r1491)
@@ -36,7 +36,7 @@
 
 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 \

Modified: nss-pam-ldapd/debian/compat
==============================================================================
--- nss-pam-ldapd/debian/compat Sun Aug  7 15:10:53 2011        (r1490)
+++ nss-pam-ldapd/debian/compat Sun Aug  7 18:40:40 2011        (r1491)
@@ -1 +1 @@
-8
+9

Modified: nss-pam-ldapd/debian/control
==============================================================================
--- nss-pam-ldapd/debian/control        Sun Aug  7 15:10:53 2011        (r1490)
+++ nss-pam-ldapd/debian/control        Sun Aug  7 18:40:40 2011        (r1491)
@@ -4,7 +4,7 @@
 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 @@
 
 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 @@
 
 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

Modified: nss-pam-ldapd/debian/libnss-ldapd.install
==============================================================================
--- nss-pam-ldapd/debian/libnss-ldapd.install   Sun Aug  7 15:10:53 2011        
(r1490)
+++ nss-pam-ldapd/debian/libnss-ldapd.install   Sun Aug  7 18:40:40 2011        
(r1491)
@@ -1 +1 @@
-lib/libnss_ldap.so*
+lib/*/libnss_ldap.so*

Modified: nss-pam-ldapd/debian/libnss-ldapd.lintian-overrides
==============================================================================
--- nss-pam-ldapd/debian/libnss-ldapd.lintian-overrides Sun Aug  7 15:10:53 
2011        (r1490)
+++ nss-pam-ldapd/debian/libnss-ldapd.lintian-overrides Sun Aug  7 18:40:40 
2011        (r1491)
@@ -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

Modified: nss-pam-ldapd/debian/libnss-ldapd.postinst
==============================================================================
--- nss-pam-ldapd/debian/libnss-ldapd.postinst  Sun Aug  7 15:10:53 2011        
(r1490)
+++ nss-pam-ldapd/debian/libnss-ldapd.postinst  Sun Aug  7 18:40:40 2011        
(r1491)
@@ -74,10 +74,6 @@
   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#

Modified: nss-pam-ldapd/debian/libpam-ldapd.install
==============================================================================
--- nss-pam-ldapd/debian/libpam-ldapd.install   Sun Aug  7 15:10:53 2011        
(r1490)
+++ nss-pam-ldapd/debian/libpam-ldapd.install   Sun Aug  7 18:40:40 2011        
(r1491)
@@ -1,2 +1,2 @@
-lib/security
+lib/*/security/pam_ldap.so
 debian/pam-configs/ldap usr/share/pam-configs

Modified: nss-pam-ldapd/debian/rules
==============================================================================
--- nss-pam-ldapd/debian/rules  Sun Aug  7 15:10:53 2011        (r1490)
+++ nss-pam-ldapd/debian/rules  Sun Aug  7 18:40:40 2011        (r1491)
@@ -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)

Added: nss-pam-ldapd/debian/source/lintian-overrides
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nss-pam-ldapd/debian/source/lintian-overrides       Sun Aug  7 18:40:40 
2011        (r1491)
@@ -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
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits

nss-pam-ldapd commit: r1491 - in nss-pam-ldapd: . debian debian/source, Commits of the nss-pam-ldapd project

Prev by Date: nss-pam-ldapd commit: r1490 - in nss-pam-ldapd: . nslcd
Next by Date: nss-pam-ldapd commit: r1492 - nss-pam-ldapd/debian
Previous by thread: nss-pam-ldapd commit: r1490 - in nss-pam-ldapd: . nslcd
Next by thread: nss-pam-ldapd commit: r1492 - nss-pam-ldapd/debian