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

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 10342f9ca2f8feb1bad31eefb5a059aa86410c8e
Author: Andrew Pollock <apollock at debian.org>
Date:   Sat Jul 24 10:13:40 2010 -0700

    Remove explicit dependency on ifupdown
    
    Make it a conflict instead
    
    Fixes #546883, #590092

diff --git a/debian/changelog b/debian/changelog
index 7cd02b7..2c706b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ isc-dhcp (4.1.1-P1-9) UNRELEASED; urgency=high
 
   * debian/control: really don't make the new packages conflict with the
     old/transitional packages (closes: #590186)
+  * debian/control: rather than depend on the version of ifupdown that invokes
+    dhclient correctly, conflict with older versions of ifupdown that do not
+    (closes: #546883, #590092)
 
- -- Andrew Pollock <apollock at debian.org>  Sat, 24 Jul 2010 10:03:25 -0700
+ -- Andrew Pollock <apollock at debian.org>  Sat, 24 Jul 2010 10:12:00 -0700
 
 isc-dhcp (4.1.1-P1-8) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1326c2d..28eb418 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), resolvconf (<= 1.45)
+Conflicts: dhcp-client (<< 3.0), samba-common (<< 3.0.0beta1-2), resolvconf (<= 1.45), ifupdown (<< 0.6.8+nmu3)
 Replaces: dhcp3-client
 Description: ISC DHCP client
  This is the client from the Internet Software Consortium's implementation of

-- 
ISC DHCP packaging for Debian