[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 7ba16ddde50d1c45868fa6aef739d3e3e8d4663a
Author: Andrew Pollock <apollock at icarus.andrew.net.au>
Date:   Sun Jul 12 16:37:10 2009 -0700

    Third attempt at getting dhclient-script installed successfully

diff --git a/debian/isc-dhcp-client.install b/debian/isc-dhcp-client.install
index aabb948..af7517f 100644
--- a/debian/isc-dhcp-client.install
+++ b/debian/isc-dhcp-client.install
@@ -1,5 +1,4 @@
 usr/sbin/dhclient sbin
-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 d1c534f..35062bb 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
 
-	$(INSTALL_FILE) -m 755 debian/dhclient-script.$(DEB_HOST_ARCH_OS) $(DESTDIR)/usr/sbin
+	cp debian/dhclient-script.$(DEB_HOST_ARCH_OS) `pwd`/debian/isc-dhcp-client/sbin
 
 	# udeb needs simplified dhclient script
 	$(INSTALL_FILE) -m 755 `pwd`/debian/dhclient-script.udeb \

-- 
ISC DHCP packaging for Debian