Move dpkg Breaks on dpkg-dev (= 1.14.13) and (= 1.14.14) to Conflicts

So that users from etch can upgrade to sid (or lenny once dpkg has
migrated). Those Conflicts should be removed before lenny's release.

diff --git a/TODO b/TODO
index 0ab119665f4e7e63739c506aff939d3e817f87e2..972b53fd9488186b78e96c7dcf440eb6d3054686 100644 (file)
--- a/TODO
+++ b/TODO
@@ -9,6 +9,8 @@ lenny
  * Triage as much bugs as possible to get the bug count below 300 ;) and
    merge as much patches as possible.
 
+ * Remove Conflicts on dpkg-dev exact versions before the release.
+
 1.14.x
 ------
 

diff --git a/debian/changelog b/debian/changelog
index 625527a54f05d6f242d70cdfa9d85995bcbdb802..ff5df765c921d0c140652acdac2a7c183d99e9f5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ dpkg (1.14.16.2) UNRELEASED; urgency=low
 
   * Change uid after changing gid and initializing supplementary groups in
     start-stop-daemon. Closes: #462018
+  * Change temporary dpkg Breaks on dpkg-dev (= 1.14.13) and (= 1.14.14)
+    to Conflicts, so that users from etch can upgrade to sid (or lenny
+    once dpkg has migrated).
 
  -- Guillem Jover <guillem@debian.org>  Tue, 22 Jan 2008 12:52:11 +0200
 

diff --git a/debian/control b/debian/control
index fbe7e681ae92266e0b0a90476b8afba651eed476..4f301a684b0b2096f89023e302661179c3b86178 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -18,9 +18,8 @@ Package: dpkg
 Architecture: any
 Essential: yes
 Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1)
-Breaks: dpkg-dev (= 1.14.13), dpkg-dev (= 1.14.14)
 Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg-static,
- dpkg-dev (<< 1.14.6)
+ dpkg-dev (<< 1.14.6), dpkg-dev (= 1.14.13), dpkg-dev (= 1.14.14)
 Replaces: dpkg-doc-ja, dpkg-static, manpages-de (<= 0.4-3),
  manpages-pl (<= 20051117-1)
 Suggests: apt, lzma