From: don <don@8f7917da-ec0b-0410-a553-b9b0e350d17e>
Date: Sat, 21 Jan 2012 22:30:57 +0000 (+0000)
Subject: * Fix typo in nscd.conf (Closes: #656615)
X-Git-Tag: debian/0.51-1~23
X-Git-Url: https://git.donarmstrong.com/?p=unscd.git;a=commitdiff_plain;h=faa068f74625dc051569fe58913562e005aab815

* Fix typo in nscd.conf (Closes: #656615)
* Add newline to nscd.conf (Closes: #656603)
* Switch to dh7 style rules file
* Update standards version; no changes
---

diff --git a/debian/changelog b/debian/changelog
index b532baf..26ca0d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 unscd (0.48-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Fix typo in nscd.conf (Closes: #656615)
+  * Add newline to nscd.conf (Closes: #656603)
+  * Switch to dh7 style rules file
+  * Update standards version; no changes
 
  -- Don Armstrong <don@debian.org>  Sat, 21 Jan 2012 13:36:59 -0800
 
diff --git a/debian/control b/debian/control
index 055cce3..138c2ec 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: unscd
 Section: admin
 Priority: extra
-Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 5), groff-base
+Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7), groff-base
 Maintainer: Don Armstrong <don@debian.org>
 VCS-Browser: http://websvn.donarmstrong.com/listing.php?repname=deb_pkgs&path=%2Funscd%2Ftrunk%2F
 VCS-Svn: http://svn.donarmstrong.com/deb_pkgs/unscd/trunk/
diff --git a/debian/nscd.conf b/debian/nscd.conf
index 3d27419..aa35af9 100644
--- a/debian/nscd.conf
+++ b/debian/nscd.conf
@@ -16,7 +16,7 @@
 #       stat-user               (ignored; any user can stat)
 #	reload-count		(ignored; unscd should never crash)
 #	paranoia		(ignored)
-#	restart-interval	(ignored; unscd should never crash)x
+#	restart-interval	(ignored; unscd should never crash)
 #
 #       enable-cache		<service> <yes|no>
 #	positive-time-to-live	<service> <time in seconds>
@@ -69,4 +69,4 @@
 	persistent		hosts		yes
 	shared			hosts		yes
 
-# unscd does not support services caching
\ No newline at end of file
+# unscd does not support services caching
diff --git a/debian/rules b/debian/rules
index 3bfb014..59e1de4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,67 +1,13 @@
 #!/usr/bin/make -f
 
-#DH_VERBOSE = 1
+%: 
+	dh $@
 
+override_dh_auto_build:
+	gcc $(CFLAGS) $(LDFLAGS) -o nscd nscd.c
 
-PREFIX=$(shell pwd)/debian/unscd/
-
-CFLAGS = -Wall -g
-
-INSTALL=install
-
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-
-	gcc $(CFLAGS) -o nscd nscd.c
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	rm -f build-stamp
-
-	rm -f nscd
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(INSTALL) -d $(PREFIX)/usr/sbin/
-	$(INSTALL) -t $(PREFIX)/usr/sbin/ nscd
-	$(INSTALL) -d $(PREFIX)/etc/
-	$(INSTALL) -m644 -t $(PREFIX)/etc/ debian/nscd.conf
-
-binary-indep:
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installman debian/nscd.8
-	dh_installinit
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch
-.PHONY: build clean binary-arch binary-indep binary install
+override_dh_auto_install:
+       $(INSTALL) -d debian/unscd/usr/sbin/
+       $(INSTALL) -t debian/unscd/usr/sbin/ nscd
+       $(INSTALL) -d debian/unscd/etc/
+       $(INSTALL) -m644 -t debian/unscd/etc/ debian/nscd.conf