[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 32531c07d7d4740cbb471d71748730490d84908c
Author: Andrew Pollock <apollock at icarus.andrew.net.au>
Date:   Sun Jul 12 16:21:49 2009 -0700

    Remove more unnecessary cruft from debian/rules
    Install dhclient-script

diff --git a/debian/rules b/debian/rules
index 08c8d90..58b16d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,16 +25,12 @@ include /usr/share/dpatch/dpatch.make
 CFLAGS = -Wall -g
 INSTALL = install
 INSTALL_FILE 	= $(INSTALL) -p -o root -g root -m 644
-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
 else
 CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-INSTALL_PROGRAM += -s
-endif
 
 build: patch-stamp build-stamp
 
@@ -46,9 +42,6 @@ build-stamp: patch-stamp
 	
 	$(MAKE)
 
-	#TODO: fix
-	cp debian/dhclient-script.$(DEB_HOST_ARCH_OS) client/scripts/debian
-
 	touch build-stamp
 
 clean: unpatch
@@ -60,7 +53,6 @@ clean: unpatch
 	# Remove leftover junk...
 	# TODO: verify if still necessary
 	rm -Rf work.*/
-	rm -f client/scripts/debian
 
 	debconf-updatepo
 	dh_clean
@@ -83,6 +75,8 @@ 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
+
 	# udeb needs simplified dhclient script
 	$(INSTALL_FILE) -m 755 `pwd`/debian/dhclient-script.udeb \
 		`pwd`/debian/isc-dhcp-client-udeb/sbin/dhclient-script

-- 
ISC DHCP packaging for Debian