[Pkg-kde-commits] rev 1622 - branches/kde-3.4.0/packages/kdebase/debian

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-08-31 19:54:31 +0000 (Wed, 31 Aug 2005)
New Revision: 1622

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/changelog
   branches/kde-3.4.0/packages/kdebase/debian/control
Log:
Add a fix for the "kdebase-data upgrade that shouldn't have been" problem.


Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-08-31 17:55:25 UTC (rev 1621)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-08-31 19:54:31 UTC (rev 1622)
@@ -1,3 +1,15 @@
+kdebase (4:3.4.2-2) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * For kdebase-data, add conflicts against old versions of kcontrol, kwin,
+    and kicker. This should prevent users from unwittingly upgrading
+    kdebase-data to 3.4.x, while the rest of KDE stays at the 3.3.x level.
+    This had resulted in kcontrol breaking and other assorted issues.
+    (Closes: #325592)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 31 Aug 2005 15:46:52 -0400
+
 kdebase (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: branches/kde-3.4.0/packages/kdebase/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/control	2005-08-31 17:55:25 UTC (rev 1621)
+++ branches/kde-3.4.0/packages/kdebase/debian/control	2005-08-31 19:54:31 UTC (rev 1622)
@@ -107,6 +107,7 @@
 Package: kdebase-data
 Section: kde
 Architecture: all
+Conflicts: kcontrol (<< 4:3.4.2-1), kwin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1)
 Replaces: kdebase (<< 4:3.0.0), kdeedu-data (<< 4:3.4.0), kdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0)
 Description: shared data files for the KDE base module
  This package contains the architecture-independent shared data files