[Pkg-kde-commits] rev 1472 - branches/kde-3.4.0/packages/kdelibs/debian

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-08-18 16:42:19 +0000 (Thu, 18 Aug 2005)
New Revision: 1472

Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/changelog
   branches/kde-3.4.0/packages/kdelibs/debian/control
Log:
Add a Conflicts with kdelibs4 on kdelibs-data, as discussed.


Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-08-18 13:14:13 UTC (rev 1471)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-08-18 16:42:19 UTC (rev 1472)
@@ -1,3 +1,13 @@
+kdelibs (4:3.4.2-2) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Make kdelibs-data conflict with kdelibs4, ensuring that kdelibs-data
+    can't be upgraded unless accompanied by the rest of the transitioned
+    kdelibs packages. (Closes: #323747)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 18 Aug 2005 11:16:00 -0400
+
 kdelibs (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release. Includes a forward declaration of KXMLGUIClient in

Modified: branches/kde-3.4.0/packages/kdelibs/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/control	2005-08-18 13:14:13 UTC (rev 1471)
+++ branches/kde-3.4.0/packages/kdelibs/debian/control	2005-08-18 16:42:19 UTC (rev 1472)
@@ -41,6 +41,7 @@
 Section: libs
 Architecture: all
 Depends: hicolor-icon-theme
+Conflicts: kdelibs4
 Replaces: kdeartwork-style (<< 4:3.4.0), konq-plugins (<< 4:3.4.0), ksvg (<< 4:3.4.0), kpackage (<< 4:3.4.2)
 Description: core shared data for all KDE applications
  This package contains all the architecture independent data files