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

[Andrew Pollock]

The following commit has been merged in the master branch:
commit fe21ed549b9a0d8443c8efbf57edfdddb4abd1ff
Author: Andrew Pollock <apollock at debian.org>
Date:   Sat Jun 26 22:42:10 2010 -0700

    2 small fixes
    
    * Really enable DHCPv6
    * conflict with resolvconf 1.45

diff --git a/debian/changelog b/debian/changelog
index c25d01b..76148ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+isc-dhcp (4.1.1-P1-4) experimental; urgency=low
+
+  * debian/rules: really enable DHCPv6 (closes: #587269)
+  * debian/control: conflict with resolvconf <= 1.45 (closes: #586095)
+
+ -- Andrew Pollock <apollock at debian.org>  Sat, 26 Jun 2010 22:33:43 -0700
+
 isc-dhcp (4.1.1-P1-3) experimental; urgency=low
 
   * debian/rules: stop invoking dh_installinit with --noscripts so the
diff --git a/debian/control b/debian/control
index b1f6d81..9a87a4e 100644
--- a/debian/control
+++ b/debian/control
@@ -90,7 +90,7 @@ Architecture: any
 Depends: debianutils (>= 2.8.2), ifupdown (>= 0.6.8+nmu3), isc-dhcp-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: resolvconf, avahi-autoipd
 Provides: dhcp3-client
-Conflicts: dhcp-client (<< 3.0), samba-common (<< 3.0.0beta1-2)
+Conflicts: dhcp-client (<< 3.0), samba-common (<< 3.0.0beta1-2), resolvconf (<= 1.45)
 Replaces: dhcp3-client
 Description: ISC DHCP client
  This is the client from the Internet Software Consortium's implementation of
diff --git a/debian/rules b/debian/rules
index 5c96303..782bebe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,11 +62,9 @@ build-stamp: patched-ldap/build-stamp
 
 	dpatch deapply-until dhcp-4.1.0-ldap-code
 	
-# See http://bugs.debian.org/549060 for why DHCPv6 has to be disabled
 	./configure \
 		--prefix=$(DESTDIR)/usr \
-		--sysconfdir=$(DESTDIR)/etc/dhcp \
-		--disable-dhcpv6 
+		--sysconfdir=$(DESTDIR)/etc/dhcp
 	
 	$(MAKE) $(CROSS)
 

-- 
ISC DHCP packaging for Debian