The following commit has been merged in the master branch:
commit bd7a8ab1d03d2cfb7a7ad4ea21e26edaca53dd39
Author: Guillem Jover <[email protected]>
Date: Fri Jul 2 12:26:48 2010 +0200
Use Breaks instead of Conflicts in dpkg, dpkg-dev and libdpkg-perl
All instances were due to files taken over, or functionality broken
due to interface changes.
diff --git a/debian/changelog b/debian/changelog
index fad8943..8e58318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,8 @@ dpkg (1.15.8) UNRELEASED; urgency=low
* Rewrite dpkg-divert in C.
* Use linux-any wildcard for libselinux1-dev Build-Depends instead of
using a list of negated architectures.
+ * Use Breaks instead of Conflicts in dpkg, dpkg-dev and libdpkg-perl binary
+ packages.
[ Updated programs translations ]
* Catalan (Guillem Jover).
diff --git a/debian/control b/debian/control
index b2bb177..dca09ba 100644
--- a/debian/control
+++ b/debian/control
@@ -32,10 +32,10 @@ Architecture: any
Essential: yes
Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1), xz-utils
Depends: ${misc:Depends}
-Conflicts: dpkg-dev (<< 1.14.16), apt (<< 0.7.7), aptitude (<< 0.4.7-1)
+Breaks: dpkg-dev (<< 1.14.16), apt (<< 0.7.7), aptitude (<< 0.4.7-1),
# install-info transition
# see http://wiki.debian.org/Transitions/DpkgToGnuInstallInfo
-Breaks: jed (<< 1:0.99.18+dfsg.1-13), xjed (<< 1:0.99.18+dfsg.1-13),
+ jed (<< 1:0.99.18+dfsg.1-13), xjed (<< 1:0.99.18+dfsg.1-13),
konqueror (<= 4:4.2.96-1), xemacs21-support (<< 21.4.22-2),
emacs22 (<= 22.3+1-1), emacs22-gtk (<= 22.3+1-1), emacs22-nox (<= 22.3+1-1),
emacs21 (<< 21.4a+1-5.7), emacs21-nox (<< 21.4a+1-5.7),
@@ -55,7 +55,7 @@ Depends: libdpkg-perl (= ${source:Version}), bzip2, xz-utils,
patch, make, binutils, base-files (>= 5.0.0), ${misc:Depends}
Recommends: gcc | c-compiler, build-essential, fakeroot, gnupg, gpgv,
libalgorithm-merge-perl
Suggests: debian-keyring
-Conflicts: dpkg-cross (<< 2.0.0), devscripts (<< 2.10.26)
+Breaks: dpkg-cross (<< 2.0.0), devscripts (<< 2.10.26)
Description: Debian package development tools
This package provides the development tools (including dpkg-source)
required to unpack, build and upload Debian source packages.
@@ -70,7 +70,7 @@ Architecture: all
Depends: dpkg (>= 1.15.4), perl, libtimedate-perl, ${misc:Depends}
Recommends: bzip2, xz-utils
Suggests: debian-keyring, gnupg, gpgv, binutils, patch
-Conflicts: dpkg-dev (<< 1.15.6)
+Breaks: dpkg-dev (<< 1.15.6)
Replaces: dpkg-dev (<< 1.15.6)
Description: Dpkg perl modules
This package provides the perl modules used by the scripts
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
