CVS commit by benb:
Don't use conflicts/replaces where we should just use replaces.
M +3 -2 changelog 1.53.2.6
M +2 -5 control 1.54.2.6
--- kdesdk/debian/control #1.54.2.5:1.54.2.6
@@ -19,5 +19,4 @@
Section: doc
Suggests: www-browser, kdesdk
-Conflicts: cervisia (<< 4:3.2.0), kbabel (<< 4:3.2.0), kbugbuster (<<
4:3.2.0), kompare (<< 4:3.2.0)
Replaces: cervisia (<< 4:3.2.0), kbabel (<< 4:3.2.0), kbugbuster (<< 4:3.2.0),
kompare (<< 4:3.2.0)
Description: KDE Software Development Kit documentation in HTML format
@@ -86,5 +85,5 @@
Section: libdevel
Depends: kbabel (= ${Source-Version}), kdelibs4-dev
-Conflicts: kbabel (<< 4:3.0.8-0)
+Replaces: kbabel (<< 4:3.0.8-0)
Description: PO-file editing suite for KDE (development files)
This is a suite of programs for editing gettext message files (PO-files).
@@ -164,5 +163,5 @@
Recommends: automake1.7 | automaken, cvs, gawk
Suggests: dmalloc, gdb, kdelibs4-doc, qt3-doc, valgrind
-Conflicts: kdevelop (<< 1:1.4.0-3.2)
+Replaces: kdevelop (<< 1:1.4.0-3.2)
Description: a set of useful development scripts for KDE
This package contains a number of scripts which can be used to help in
@@ -227,5 +226,4 @@
Depends: ${shlibs:Depends}, cvs
Recommends: kdelibs-bin
-Conflicts: cervisia (<< 4:3.2.0)
Replaces: cervisia (<< 4:3.2.0)
Description: DCOP service for accessing CVS repositories
@@ -243,5 +241,4 @@
Section: libdevel
Depends: libcvsservice0 (= ${Source-Version})
-Conflicts: cervisia (<< 4:3.2.0)
Replaces: cervisia (<< 4:3.2.0)
Description: development files for CVS DCOP service
--- kdesdk/debian/changelog #1.53.2.5:1.53.2.6
@@ -1,7 +1,8 @@
kdesdk (4:3.2.1-2) unstable; urgency=low
- * Add conflicts/replaces for umbrello-manual (closes: #237173).
+ * Add Conflicts/Replaces for umbrello-manual (closes: #237173).
+ * Don't use Conflicts/Replaces elsewhere where we should just use Replaces.
- -- Ben Burton <[EMAIL PROTECTED]> Thu, 11 Mar 2004 09:20:36 +1100
+ -- Ben Burton <[EMAIL PROTECTED]> Tue, 16 Mar 2004 09:15:01 +1100
kdesdk (4:3.2.1-1) unstable; urgency=low
