rev 7135 - trunk/packages/kdelibs/debian

[Adeodato Simó]

Author: adeodato
Date: 2007-08-28 19:31:34 +0000 (Tue, 28 Aug 2007)
New Revision: 7135

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
Log:
Add missing Replaces.

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2007-08-25 03:50:13 UTC (rev 7134)
+++ trunk/packages/kdelibs/debian/changelog	2007-08-28 19:31:34 UTC (rev 7135)
@@ -1,3 +1,13 @@
+kdelibs (4:3.5.7.dfsg.1-7) unstable; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * Add appropriate Replaces headers for the files moved in -5 and -6. Remove
+    unneeded Conflict in kdelibs4-dev against kdelibs4c2a introduced in -6.
+    (Closes: #439515)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 28 Aug 2007 21:27:28 +0200
+
 kdelibs (4:3.5.7.dfsg.1-6) unstable; urgency=low
 
   * Move back kstartupconfig to kdelibs4c2a. (Closes: #439411)

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2007-08-25 03:50:13 UTC (rev 7134)
+++ trunk/packages/kdelibs/debian/control	2007-08-28 19:31:34 UTC (rev 7135)
@@ -58,7 +58,8 @@
 Suggests: fam, perl-suid
 Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6)
 Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0),
- kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1)
+ kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1),
+ kdelibs4-dev (= 4:3.5.7.dfsg.1-5)
 Description: core libraries and binaries for all KDE applications
  This package contains all the shared libraries and common core binaries
  used by all KDE applications. You need these libraries and binaries to
@@ -88,8 +89,7 @@
  libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev,
  libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4)
 Provides: kdelibs-dev
-Conflicts: kdelibs4c2a (<< 4:3.5.7.dfsg.1-6)
-Replaces: kdebase-dev (<< 4:3.4.0)
+Replaces: kdebase-dev (<< 4:3.4.0), kdelibs4c2a (<< 4:3.5.7.dfsg.1-5)
 Description: development files for the KDE core libraries
  This package contains all the headers and other related files needed
  to compile KDE applications, or develop applications which use the