[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.0-1-7-g95706d5

[Andrew Pollock]

The following commit has been merged in the master branch:
commit a0a0eee730da285247833b75388bdb9d2aa42683
Author: Andrew Pollock <apollock at icarus.andrew.net.au>
Date:   Sun Jul 12 16:30:41 2009 -0700

    Second attempt at correctly installing dhclient-script

diff --git a/debian/changelog b/debian/changelog
index 0d44a90..f5e1a59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,9 @@ isc-dhcp (4.1.0-1) unstable; urgency=low
 
   * The "throw everything out and start over" release
   * New upstream release
-  * debian/control: drop 3 from the binary package names, adjust dependencies
+  * debian/control: drop 3 from the binary package names, adjust dependencies,
+    maintainer scripts, accordingly
+  * use debhelper more extensively, de-cruft debian/rules
 
  -- Andrew Pollock <apollock at debian.org>  Sun, 05 Apr 2009 11:48:34 -0700
 
diff --git a/debian/isc-dhcp-client.install b/debian/isc-dhcp-client.install
index 6f40fe9..aabb948 100644
--- a/debian/isc-dhcp-client.install
+++ b/debian/isc-dhcp-client.install
@@ -1,5 +1,5 @@
 usr/sbin/dhclient sbin
-#usr/sbin/dhclient-script
+usr/sbin/dhclient-script sbin
 etc/dhcp/dhclient.conf
 usr/share/man/man8/dhclient.8
 usr/share/man/man8/dhclient-script.8
diff --git a/debian/rules b/debian/rules
index 58b16d7..d1c534f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ install-stamp: build-stamp
 	# Install dhcp-client's conffiles.
 	$(INSTALL_FILE) -m 644 debian/dhclient.conf $(DESTDIR)/etc/dhcp
 
-	cp debian/dhclient-script.$(DEB_HOST_ARCH_OS) $(DESTDIR)/debian/tmp/sbin
+	$(INSTALL_FILE) -m 755 debian/dhclient-script.$(DEB_HOST_ARCH_OS) $(DESTDIR)/usr/sbin
 
 	# udeb needs simplified dhclient script
 	$(INSTALL_FILE) -m 755 `pwd`/debian/dhclient-script.udeb \

-- 
ISC DHCP packaging for Debian