[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 5027916d9f92fc23cecf1217185ee93bfe2a652a
Author: Andrew Pollock <apollock at debian.org>
Date:   Sat Jul 24 10:09:14 2010 -0700

    Fix isc-dhcp-relay's conflict with dhcp3-relay
    
    Fixes bug #590186

diff --git a/debian/changelog b/debian/changelog
index 941774b..7cd02b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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)
+
+ -- Andrew Pollock <apollock at debian.org>  Sat, 24 Jul 2010 10:03:25 -0700
+
 isc-dhcp (4.1.1-P1-8) unstable; urgency=low
 
   * debian/dhcp3-client.postrm: bring back to clean up cruft (closes: #588203)
diff --git a/debian/control b/debian/control
index 15daa51..1326c2d 100644
--- a/debian/control
+++ b/debian/control
@@ -143,7 +143,7 @@ Priority: optional
 Architecture: any
 Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: dhcp3-relay
-Conflicts: dhcp-relay, dhcp3-relay
+Conflicts: dhcp-relay
 Replaces: dhcp3-relay
 Description: ISC DHCP relay daemon
  This is the relay from the Internet Software Consortium's implementation of

-- 
ISC DHCP packaging for Debian