The following commit has been merged in the master branch:
commit cf9ff8788cfa8b087862cfdd0c0e3afbefae98ae
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Fri Apr 25 14:42:36 2008 +0200
Cleanup of various Conflicts/Replaces
diff --git a/debian/changelog b/debian/changelog
index 35fd47b..25b5520 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,15 @@ dpkg (1.14.19) UNRELEASED; urgency=low
Closes: #476113
* Fix dpkg-source to grant correct permissions to tarballs of native
source packages. Closes: #477784
+ * Add Conflicts: devscripts (<< 2.10.26) to ensure that people are
+ using versions of debsign/mergechanges that support the Checksums fields
+ in *.dsc and *.changes.
+ * Cleanup the various Conflicts/Replaces fields to remove references
+ to package that have disappeared before sarge (this includes dpkg-doc-ja,
+ dpkgname, and dpkg-static which has never officially been built).
+ dpkg-iasearch has been kept as popcon still reports a few installations.
+ * Collapsed multiple conflicts of dpkg with old versions of dpkg-dev
+ in a single Conflicts: dpkg-dev (<< 1.14.16).
[ Helge Kreutzmann ]
* Minor fixes and clarifications to man pages.
diff --git a/debian/control b/debian/control
index 4cc3509..c1ca901 100644
--- a/debian/control
+++ b/debian/control
@@ -19,11 +19,9 @@ Package: dpkg
Architecture: any
Essential: yes
Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1)
-Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg-static,
- dpkg-dev (<< 1.14.6), dpkg-dev (= 1.14.13), dpkg-dev (= 1.14.14),
- apt (<< 0.7.7), aptitude (<< 0.4.7-1)
-Replaces: dpkg-doc-ja, dpkg-static, manpages-de (<= 0.4-3),
- manpages-pl (<= 20051117-1)
+Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11),
+ dpkg-dev (<< 1.14.16), apt (<< 0.7.7), aptitude (<< 0.4.7-1)
+Replaces: manpages-de (<= 0.4-3), manpages-pl (<= 20051117-1)
Suggests: apt, lzma
Description: package maintenance system for Debian
This package contains the low-level commands for handling the installation
@@ -40,8 +38,8 @@ Depends: dpkg (>= 1.14.6), perl5, perl-modules, cpio (>=
2.4.2-2), bzip2, lzma,
patch (>= 2.2-1), make, binutils, libtimedate-perl
Recommends: gcc | c-compiler, build-essential
Suggests: gnupg, debian-keyring
-Conflicts: dpkgname, dpkg-cross (<< 2.0.0)
-Replaces: dpkgname, dpkg (<< 1.4.1.8), dpkg-doc-ja, manpages-pl (<= 20051117-1)
+Conflicts: dpkg-cross (<< 2.0.0), devscripts (<< 2.10.26)
+Replaces: manpages-pl (<= 20051117-1)
Description: package building tools for Debian
This package contains the tools (including dpkg-source) required to
unpack, build and upload Debian source packages.
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
