lists.arthurdejong.org
RSS feed

nss-pam-ldapd commit: r1478 - in nss-pam-ldapd: . debian debian/pam-configs

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

nss-pam-ldapd commit: r1478 - in nss-pam-ldapd: . debian debian/pam-configs

Author: arthur
Date: Sat Jul  2 23:50:05 2011
New Revision: 1478
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1478

Log:
switch to dh for debian/rules and bump debhelper compatibility to 8

Added:
   nss-pam-ldapd/debian/pam-configs/
   nss-pam-ldapd/debian/pam-configs/ldap
      - copied unchanged from r1475, 
nss-pam-ldapd/debian/libpam-ldapd.pam-auth-update
Deleted:
   nss-pam-ldapd/debian/libpam-ldapd.pam-auth-update
Modified:
   nss-pam-ldapd/Makefile.am
   nss-pam-ldapd/debian/compat
   nss-pam-ldapd/debian/control
   nss-pam-ldapd/debian/libpam-ldapd.install
   nss-pam-ldapd/debian/nslcd.install
   nss-pam-ldapd/debian/rules

Modified: nss-pam-ldapd/Makefile.am
==============================================================================
--- nss-pam-ldapd/Makefile.am   Sat Jul  2 23:28:19 2011        (r1477)
+++ nss-pam-ldapd/Makefile.am   Sat Jul  2 23:50:05 2011        (r1478)
@@ -57,10 +57,10 @@
                debian/libpam-ldapd.install \
                debian/libpam-ldapd.lintian-overrides \
                debian/libpam-ldapd.manpages \
-               debian/libpam-ldapd.pam-auth-update \
                debian/libpam-ldapd.postinst \
                debian/libpam-ldapd.prerm \
                debian/libpam-ldapd.templates \
+               debian/pam-configs/ldap \
                debian/po/POTFILES.in debian/po/templates.pot \
                $(wildcard debian/po/*.po)
 

Modified: nss-pam-ldapd/debian/compat
==============================================================================
--- nss-pam-ldapd/debian/compat Sat Jul  2 23:28:19 2011        (r1477)
+++ nss-pam-ldapd/debian/compat Sat Jul  2 23:50:05 2011        (r1478)
@@ -1 +1 @@
-7
+8

Modified: nss-pam-ldapd/debian/control
==============================================================================
--- nss-pam-ldapd/debian/control        Sat Jul  2 23:28:19 2011        (r1477)
+++ nss-pam-ldapd/debian/control        Sat Jul  2 23:50:05 2011        (r1478)
@@ -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 (>= 7), libkrb5-dev, libldap2-dev, libsasl2-dev, 
po-debconf (>= 0.5.0), docbook2x, docbook-xml, libpam0g-dev
+Build-Depends: debhelper (>= 8), 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/

Modified: nss-pam-ldapd/debian/libpam-ldapd.install
==============================================================================
--- nss-pam-ldapd/debian/libpam-ldapd.install   Sat Jul  2 23:28:19 2011        
(r1477)
+++ nss-pam-ldapd/debian/libpam-ldapd.install   Sat Jul  2 23:50:05 2011        
(r1478)
@@ -1,2 +1,2 @@
 lib/security
-usr/share/pam-configs/ldap
+debian/pam-configs/ldap usr/share/pam-configs

Modified: nss-pam-ldapd/debian/nslcd.install
==============================================================================
--- nss-pam-ldapd/debian/nslcd.install  Sat Jul  2 23:28:19 2011        (r1477)
+++ nss-pam-ldapd/debian/nslcd.install  Sat Jul  2 23:50:05 2011        (r1478)
@@ -1,2 +1 @@
-etc
 usr/sbin

Modified: nss-pam-ldapd/debian/rules
==============================================================================
--- nss-pam-ldapd/debian/rules  Sat Jul  2 23:28:19 2011        (r1477)
+++ nss-pam-ldapd/debian/rules  Sat Jul  2 23:50:05 2011        (r1478)
@@ -2,84 +2,17 @@
 
 export DH_VERBOSE=1
 
-# code for passing host/build options to configure
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
+%:
+       dh $@
 
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       ./configure $(confflags) \
-                   --prefix=/usr \
-                   --mandir=\$${prefix}/share/man \
-                   --sysconfdir=/etc \
-                   --localstatedir=/var \
+override_dh_auto_configure:
+       dh_auto_configure -- \
                    --libdir=/lib \
                    --enable-warnings \
-                   --disable-maintainer-mode \
-                   --disable-dependency-tracking \
                    --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
-       touch configure-stamp
 
-build: configure-stamp build-stamp
-build-stamp:
-       dh_testdir
-       $(MAKE)
-       touch build-stamp
-
-clean:
-       -test -r /usr/share/misc/config.sub && \
-         cp -f /usr/share/misc/config.sub config.sub
-       -test -r /usr/share/misc/config.guess && \
-         cp -f /usr/share/misc/config.guess config.guess
-       dh_testdir
-       dh_testroot
-       [ ! -f Makefile ] || $(MAKE) distclean
-       dh_clean
-       debconf-updatepo --verbose
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_prep
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       # make configfile fully generated
-       rm -f $(CURDIR)/debian/tmp/etc/nslcd.conf
-       dh_lintian
-       # install a pam-auth-update configuration file
-       install -D -m 644 debian/libpam-ldapd.pam-auth-update 
debian/tmp/usr/share/pam-configs/ldap
-
-# build architecture-independent files
-binary-indep: build install
-# we have nothing to do by default
-
-# build architecture-dependent files
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_install
-       dh_installdebconf
-       dh_installdocs
-       dh_installexamples
-       dh_installinit
-       dh_installman
-       dh_installchangelogs
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
+override_dh_makeshlibs:
+       # do not generate shlibs (shared NSS library not meant to be linked)
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits