[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. 954dedb356800b60370bbd67c1110e7359096ba3

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 332114dc62cb8c20e3d6701154d69e481de0c39f
Author: Andrew Pollock <apollock at debian.org>
Date:   Sun Oct 4 00:38:08 2009 -0700

    Mention that DHCPv6 is disabled and update README.Debian for 4.1.0

diff --git a/debian/README.Debian b/debian/README.Debian
index 558dcd4..19d4642 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -4,32 +4,32 @@ ISC DHCP for Debian
 This is the Debian-packaged version of the Internet Software Consortium
 (ISC) DHCP package.
 
-This release has full support for operation on multiple interfaces and needs
-a 2.2.x or later kernel; the 2.0.x kernels are _not_ supported.
-
 The sources of the ISC DHCP package produce the following Debian packages:
 
-dhcp3-common: Files used by all the dhcp packages.
-dhcp3-server: DHCP Server
-dhcp3-client: A DHCP Client
-dhcp3-client-udeb: Small DHCP client for debian-installer
-dhcp3-relay: A DHCP Relay
-dhcp3-dev: API for accessing and modifying the DHCP server and client state
-
-If you get the following error when trying to run dhclient, dhcpd or
-dhcrelay:
-
-   Can't install packet filter program: Protocol not available
-   exiting.
-
-then you need to edit your linux kernel .config file, set CONFIG_FILTER=y,
-and rebuild your kernel. See /usr/share/doc/dhcp3-server/README.gz for
-more information.
-
-PLEASE NOTE: Upon upgrading dhcp3-client, dhclient is NOT restarted. Therefore,
-after upgrading, the version of dhclient running will still be from the
-previous version of dhcp3-client that was installed.
+isc-dhcp-common: Files used by all of the ISC DHCP packages
+isc-dhcp-server: The DHCP server itself
+isc-dhcp-server-dbg: Debugging symbols for the DHCP server
+isc-dhcp-dev: API for accessing and modifying the DHCP server and client state
+isc-dhcp-client: The DHCP client itself
+isc-dhcp-client-dbg: Debugging symbols for the DHCP client
+isc-dhcp-client-udeb: A stripped down DHCP client package for debian-installer
+isc-dhcp-relay: The DHCP relay
+isc-dhcp-relay-dbg: Debugging symbols for the DHCP relay
+dhcp3-server: Dummy package for transitioning from v3 packages
+dhcp3-client: Dummy package for transitioning from v3 packages
+dhcp3-relay: Dummy package for transitioning from v3 packages
+dhcp3-common: Dummy package for transitioning from v3 packages
+dhcp3-dev: Dummy package for transitioning from v3 packages
+
+PLEASE NOTE: Upon upgrading isc-dhcp-client, dhclient is NOT restarted.
+Therefore, after upgrading, the version of dhclient running will still be from
+the previous version of isc-dhcp-client that was installed.
+
+PLEASE NOTE: DHCPv6 is not currently enabled because the package does not build successfully. See http://bugs.debian.org/549060
+
+The Debian ISC DHCP package is moving toward collaborative maintenance. If
+you're interested in assisting with the maintenance of the package, see
+http://alioth.debian.org/projects/pkg-dhcp
 
-Eloy A. Paris <peloy at debian.org>
-Matt Zimmerman <mdz at debian.org>
 Andrew Pollock <apollock at debian.org>
+ISC DHCP Package Maintainers <pkg-dhcp-devel at lists.alioth.debian.org>
diff --git a/debian/changelog b/debian/changelog
index 456e094..40632dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+isc-dhcp (4.1.0-2) UNRELEASED; urgency=low
+
+  * debian/README.Debian: update for current upstream version, specifically
+    mention that DHCPv6 is disabled
+  * debian/rules: provide a pointer to why DHCPv6 is disabled
+
+ -- Andrew Pollock <apollock at debian.org>  Sat, 03 Oct 2009 15:51:31 -0700
+
 isc-dhcp (4.1.0-1) experimental; urgency=low
 
   * The "throw everything out and start over" release
diff --git a/debian/rules b/debian/rules
index 7a3a6e1..b647299 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ build: patch-stamp build-stamp
 
 build-stamp: patch-stamp
 	
+# See http://bugs.debian.org/549060 for why DHCPv6 has to be disabled
 	./configure \
 		--prefix=$(DESTDIR)/usr \
 		--sysconfdir=$(DESTDIR)/etc/dhcp \
@@ -58,10 +59,6 @@ clean: unpatch
 
 	[ ! -f Makefile ] || $(MAKE) distclean
 
-	# Remove leftover junk...
-	# TODO: verify if still necessary
-	rm -Rf work.*/
-
 	debconf-updatepo
 	dh_clean
 

-- 
ISC DHCP packaging for Debian