[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-60-gaf60a56

[Andrew Pollock]

The following commit has been merged in the master branch:
commit af60a56a5d9b495c7186030e019a248965cbd1bb
Author: Andrew Pollock <apollock at debian.org>
Date:   Wed Jan 11 21:17:43 2012 -0800

    Clean up targets
    
    Rename a bunch of the targets to reflect that we're not having to resort to patchery
    to build the LDAP version of the dhcp server

diff --git a/debian/changelog b/debian/changelog
index 95cf07c..318db5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ isc-dhcp (4.2.2-3) UNRELEASED; urgency=low
     - debian/rules: remove dpatch-related target dependencies
     - convert patches from dpatch to pure quilt
     - remove debian/README.source
+  * debian/rules: cleaned up the target names a bit to reflect the lack of
+    patching going on now
 
- -- Andrew Pollock <apollock at debian.org>  Sun, 08 Jan 2012 14:04:44 -0800
+ -- Andrew Pollock <apollock at debian.org>  Wed, 11 Jan 2012 21:13:08 -0800
 
 isc-dhcp (4.2.2-2) unstable; urgency=low
 
diff --git a/debian/isc-dhcp-server-ldap.install b/debian/isc-dhcp-server-ldap.install
index ecde2fe..21330f5 100644
--- a/debian/isc-dhcp-server-ldap.install
+++ b/debian/isc-dhcp-server-ldap.install
@@ -1 +1 @@
-patched-ldap/dhcpd usr/sbin
+isc-dhcp-server-ldap/dhcpd usr/sbin
diff --git a/debian/rules b/debian/rules
index 4f120d0..a9bcc96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ CFLAGS += -D_PATH_DHCPD_CONF='"/etc/dhcp/dhcpd.conf"'
 CFLAGS += -D_PATH_DHCLIENT_CONF='"/etc/dhcp/dhclient.conf"'
 CFLAGS += -DNOMINUM
 
-patched-ldap/build-stamp:
+build-ldap-stamp:
 	dh_testdir
 
 	./configure \
@@ -49,17 +49,22 @@ patched-ldap/build-stamp:
 		
 	$(MAKE) $(CROSS)
 
-	mkdir -p patched-ldap
-	mv server/dhcpd patched-ldap/
+	mkdir -p isc-dhcp-server-ldap
+	mv server/dhcpd isc-dhcp-server-ldap/
 	
 	touch $@
 	
 build: build-arch build-indep
 
-build-arch: build-stamp
-build-indep: build-stamp
+build-arch: build-ldap-stamp build-non-ldap-stamp build-arch-stamp
+build-indep:
 
-build-stamp: patched-ldap/build-stamp
+build-arch-stamp:
+	dh_testdir
+	touch $@
+
+build-non-ldap-stamp:
+	dh_testdir
 
 	./configure \
 		--prefix=$(DESTDIR)/usr \
@@ -71,12 +76,12 @@ build-stamp: patched-ldap/build-stamp
 	
 	$(MAKE) $(CROSS)
 
-	touch build-stamp
+	touch $@
 
 clean:
 	dh_testdir
-	rm -f build-stamp install-stamp
-	rm -Rf patched-ldap
+	rm -f build*stamp install*stamp
+	rm -Rf isc-dhcp-server-ldap
 
 	[ ! -f Makefile ] || $(MAKE) distclean
 
@@ -84,7 +89,7 @@ clean:
 	dh_clean
 
 install: install-stamp
-install-stamp: build-stamp
+install-stamp: build-ldap-stamp build-non-ldap-stamp
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -138,11 +143,11 @@ ifeq ($(DEB_HOST_ARCH_OS), linux)
 endif
 	dh_lintian
 
-	touch install-stamp
+	touch $@
 
 # Build architecture-dependent files here (this package does not contain
 #	architecture-independent files).
-binary-arch: build install
+binary-arch: build-arch install
 	dh_testdir
 	dh_testroot 
 	dh_installdebconf
@@ -166,8 +171,8 @@ binary-arch: build install
 	dh_md5sums -a --no-package=isc-dhcp-client-udeb
 	dh_builddeb
 
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+binary-indep: build-indep
+
+binary: binary-arch binary-indep
 
-binary: binary-arch
 .PHONY: build clean binary-indep binary-arch binary

-- 
ISC DHCP packaging for Debian