[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. upstream/4.1.1-52-g20834f7

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 20834f78266818a3a41a0643c43af44b187c6c9d
Author: Andrew Pollock <apollock at debian.org>
Date:   Fri Jun 4 10:47:03 2010 -0700

    Reenable DHCPv6

diff --git a/debian/README.Debian b/debian/README.Debian
index 19d4642..571c9df 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -25,8 +25,6 @@ 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
diff --git a/debian/changelog b/debian/changelog
index 5682850..5c2290a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-isc-dhcp (4.1.1-2) UNRELEASED; urgency=low
+isc-dhcp (4.1.1-2) experimental; urgency=low
 
   * debian/control: make dhcp3-* packages match what the override file says
+  * debian/rules: DHCPv6 support builds now, stop disabling (closes: #549060)
+  * debian/README.Debian: stop mentioning DHCPv6 is disabled
 
- -- Andrew Pollock <apollock at debian.org>  Sun, 07 Mar 2010 20:09:33 -0800
+ -- Andrew Pollock <apollock at debian.org>  Fri, 04 Jun 2010 10:46:42 -0700
 
 isc-dhcp (4.1.1-1) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 3fe0ead..d7ba52b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,7 @@ patched-ldap/build-stamp:
 	./configure \
 		--prefix=$(DESTDIR)/usr \
 		--sysconfdir=$(DESTDIR)/etc/dhcp \
-		--enable-ldap-conf --disable-ldap-casa \
-		--disable-dhcpv6 
+		--enable-ldap-conf --disable-ldap-casa
 		
 	for f in common ../minires ../dst ../omapip ../dhcpctl ../server; do \
 		cd $$f;\

-- 
ISC DHCP packaging for Debian