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

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 3180068e2ceddc34aa52acc52cbe690472a936ec
Author: Andrew Pollock <apollock at debian.org>
Date:   Sun Jun 6 20:02:11 2010 -0700

    Don't conflict with old/transitional packages
    
    I think this prevents the transitional packages installing the new packages

diff --git a/debian/changelog b/debian/changelog
index 5c2290a..5b7e871 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+isc-dhcp (4.1.1-3) experimental; urgency=low
+
+  * debian/control: don't make the new packages conflict with the
+    old/transitional packages
+
+ -- Andrew Pollock <apollock at debian.org>  Sun, 06 Jun 2010 20:01:22 -0700
+
 isc-dhcp (4.1.1-2) experimental; urgency=low
 
   * debian/control: make dhcp3-* packages match what the override file says
diff --git a/debian/control b/debian/control
index 765ab0f..b1f6d81 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Priority: optional
 Architecture: any
 Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), lsb-base, ${shlibs:Depends}, ${misc:Depends}
 Provides: dhcp3-server
-Conflicts: dhcp, dhcp3-server
+Conflicts: dhcp
 Replaces: dhcp3-server
 Suggests: isc-dhcp-server-ldap
 Description: ISC DHCP server for automatic IP address assignment
@@ -50,7 +50,7 @@ Priority: optional
 Architecture: any
 Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), isc-dhcp-server (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: dhcp3-server-ldap
-Conflicts: dhcp, dhcp3-server, dhcp3-server-ldap
+Conflicts: dhcp
 Replaces: dhcp3-server-ldap
 Enhances: isc-dhcp-server
 Description: DHCP server able to use LDAP as backend
@@ -68,7 +68,6 @@ Package: isc-dhcp-common
 Architecture: any
 Section: net
 Provides: dhcp3-common
-Conflicts: dhcp3-common
 Replaces: dhcp3-common
 Depends: debianutils (>= 2.8.2), ${shlibs:Depends}, ${misc:Depends}
 Description: common files used by all the isc-dhcp* packages
@@ -80,7 +79,6 @@ Priority: optional
 Architecture: any
 Section: devel
 Provides: dhcp3-dev
-Conflicts: dhcp3-dev
 Replaces: dhcp3-dev
 Depends: libc6-dev, ${misc:Depends}
 Description: API for accessing and modifying the DHCP server and client state
@@ -92,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), dhcp3-client
+Conflicts: dhcp-client (<< 3.0), samba-common (<< 3.0.0beta1-2)
 Replaces: dhcp3-client
 Description: ISC DHCP client
  This is the client from the Internet Software Consortium's implementation of

-- 
ISC DHCP packaging for Debian