[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 8b693a353c7591397221699f702152558e7e48d2
Author: Andrew Pollock <apollock at icarus.andrew.net.au>
Date:   Sun Jul 12 16:08:58 2009 -0700

    Fix up installation of hooks

diff --git a/debian/isc-dhcp-client.install b/debian/isc-dhcp-client.install
index 3ef4fa8..6f40fe9 100644
--- a/debian/isc-dhcp-client.install
+++ b/debian/isc-dhcp-client.install
@@ -5,5 +5,3 @@ usr/share/man/man8/dhclient.8
 usr/share/man/man8/dhclient-script.8
 usr/share/man/man5/dhclient.conf.5
 usr/share/man/man5/dhclient.leases.5
-debian/debug-enter etc/dhcp/dhclient-enter-hooks.d/debug
-debian/debug-exit etc/dhcp/dhclient-exit-hooks.d/debug
diff --git a/debian/rules b/debian/rules
index 63f9b56..08c8d90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,10 +83,6 @@ install-stamp: build-stamp
 	# Install dhcp-client's conffiles.
 	$(INSTALL_FILE) -m 644 debian/dhclient.conf $(DESTDIR)/etc/dhcp
 
-	# install the udeb binary
-	#$(INSTALL_PROGRAM) -m 755 $(DESTDIR)/usr/sbin/dhclient \
-	#	`pwd`/debian/isc-dhcp-client-udeb/sbin/
-
 	# udeb needs simplified dhclient script
 	$(INSTALL_FILE) -m 755 `pwd`/debian/dhclient-script.udeb \
 		`pwd`/debian/isc-dhcp-client-udeb/sbin/dhclient-script
@@ -105,8 +101,8 @@ install-stamp: build-stamp
 			$(DESTDIR)/usr/share/man/ja/man8; \
 	done
 
-	#cp debian/debug-enter debian/isc-dhcp-client/etc/dhcp/dhclient-enter-hooks.d/debug
-	#cp debian/debug-exit debian/isc-dhcp-client/etc/dhcp/dhclient-exit-hooks.d/debug
+	cp debian/debug-enter debian/isc-dhcp-client/etc/dhcp/dhclient-enter-hooks.d/debug
+	cp debian/debug-exit debian/isc-dhcp-client/etc/dhcp/dhclient-exit-hooks.d/debug
 	cp debian/rfc3442-classless-routes debian/isc-dhcp-client/etc/dhcp/dhclient-exit-hooks.d
 
 	dh_install

-- 
ISC DHCP packaging for Debian