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

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

7 files changed, 10 insertions, 78 deletions

diff --git a/Makefile.am b/Makefile.am
index 027c83d..61ea1f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,10 +57,10 @@ DEBIAN_FILES = debian/changelog debian/compat debian/control \
                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)
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index c532817..22d1cc6 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 (>= 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/
diff --git a/debian/libpam-ldapd.install b/debian/libpam-ldapd.install
index dc09072..b447a4f 100644
--- a/debian/libpam-ldapd.install
+++ b/debian/libpam-ldapd.install
@@ -1,2 +1,2 @@
 lib/security
-usr/share/pam-configs/ldap
+debian/pam-configs/ldap usr/share/pam-configs
diff --git a/debian/nslcd.install b/debian/nslcd.install
index 44ac6eb..236670a 100644
--- a/debian/nslcd.install
+++ b/debian/nslcd.install
@@ -1,2 +1 @@
-etc
 usr/sbin
diff --git a/debian/libpam-ldapd.pam-auth-update b/debian/pam-configs/ldap
index 9181a69..9181a69 100644
--- a/debian/libpam-ldapd.pam-auth-update
+++ b/debian/pam-configs/ldap
diff --git a/debian/rules b/debian/rules
index 87cf87e..530e008 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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)