clean up Debian packaging a bit

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

5 files changed, 23 insertions, 15 deletions

diff --git a/Makefile.am b/Makefile.am
index 5e46fd2..d37802e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,8 +26,15 @@ man_MANS = nss_ldap.5
 EXTRA_DIST = ChangeLog \
              AUTHORS ANNOUNCE NEWS INSTALL README COPYING \
              ldap.conf \
-             debian \
-             nslcd.h nslcd-common.h
+             debian/changelog debian/compat debian/config \
+             debian/control debian/copyright debian/rules \
+             debian/templates debian/libnss-ldapd.docs \
+             debian/libnss-ldapd.postinst \
+             debian/libnss-ldapd.postrm debian/README.Debian \
+             debian/po/*.po debian/po/templates.pot \
+             debian/po/POTFILES.in \
+             nslcd.h nslcd-common.h \
+             nss_ldap.5
 
 NSS_LDAP_PATH_CONF = @NSS_LDAP_PATH_CONF@
 
@@ -39,3 +46,11 @@ install-ldap_conf:
 	else \
 	  $(INSTALL_DATA) -D $(srcdir)/ldap.conf $(DESTDIR)$(NSS_LDAP_PATH_CONF); \
 	fi
+
+# target for easily creating a Debian package
+# the find is an ugly hack to fix a bug if being built on an nfs filesystem
+deb: distdir
+	find $(distdir) -type d | xargs touch
+	cd $(distdir) && \
+	  debuild
+	rm -rf $(distdir)
diff --git a/debian/changelog b/debian/changelog
index 4e9475c..0daf76e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -601,7 +601,3 @@ libnss-ldap (2.49-1) unstable; urgency=low
   * Initial Release.
 
  -- Ben Collins <bcollins@debian.org>  Thu, 11 Feb 1999 22:46:20 -0500
-
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/control b/debian/control
index 6206680..82f402f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libnss-ldapd
 Section: net
 Priority: extra
 Maintainer: Arthur de Jong <adejong@debian.org>
-Standards-Version: 3.5.9.0
+Standards-Version: 3.7.2
 Build-Depends: debhelper (>= 4.1.13), libkrb5-dev, libldap2-dev, libsasl2-dev, po-debconf (>= 0.5.0)
 
 Package: libnss-ldapd
diff --git a/debian/libnss-ldapd.postinst b/debian/libnss-ldapd.postinst
index db7c0e9..3a10868 100644
--- a/debian/libnss-ldapd.postinst
+++ b/debian/libnss-ldapd.postinst
@@ -60,7 +60,7 @@ case "$1" in
 
 		# lets create the configuration from example if it's not there.
 		examplefile=/usr/share/$PACKAGE/ldap.conf
-		if [ ! -e $CONFFILE -a -e $examplefile ]; then
+		if [ ! -e $CONFFILE ] && [ -e $examplefile ]; then
 			cat > $CONFFILE << EOM
 ###DEBCONF###
 # the configuration of this file will be done by debconf as long as the
@@ -162,10 +162,11 @@ EOM
        ;;
 esac
 
-if [ -e /etc/ldap.secret -a ! -e /etc/libnss-ldap.secret ]; then
+if [ -e /etc/ldap.secret ] && [ ! -e /etc/libnss-ldap.secret ]; then
 	cp -p /etc/ldap.secret /etc/libnss-ldap.secret
 fi
 
+# restart nscd for some reason
 if [ -s /usr/sbin/nscd ]; then
 	if [ `pidof -s nscd` ]; then 
 		if which invoke-rc.d >/dev/null 2>&1; then
@@ -176,10 +177,4 @@ if [ -s /usr/sbin/nscd ]; then
 	fi
 fi
 
-# This directory was used earlier, and should no longer have any
-# function (we use /lib/init/rw instead).
-if [ -d /var/lib/libnss-ldap ]; then
-	rm -rf /var/lib/libnss-ldap
-fi
-
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 2b41df9..9366eb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,8 @@ configure-stamp:
 	            --with-ldap-lib=openldap \
 	            --with-ldap-conf-file=/etc/libnss-ldap.conf \
 	            --with-ldap-secret-file=/etc/libnss-ldap.secret \
+	            --with-nslcd-pidfile=/var/run/nslcd/nslcd.pid \
+	            --with-nslcd-socket=/var/run/nslcd/socket \
 	            --enable-schema-mapping \
 	            --enable-paged-results \
 	            --enable-configurable-krb5-ccname-gssapi