rev 18432 - trunk/packages/kdebase-workspace/debian

[Fathi Boudra]

Author: fabo
Date: 2010-07-05 12:12:40 +0000 (Mon, 05 Jul 2010)
New Revision: 18432

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/control
Log:
Add missing Conflicts/Replaces with ksplash to kdebase-workspace-bin package

Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2010-07-04 16:11:40 UTC (rev 18431)
+++ trunk/packages/kdebase-workspace/debian/changelog	2010-07-05 12:12:40 UTC (rev 18432)
@@ -15,6 +15,10 @@
     to fix plasma-netbook autostart when only plasma-netbook
     is installed. (Closes: #584905)
 
+  [ Fathi Boudra]
+  * Add missing Conflicts/Replaces with ksplash to kdebase-workspace-bin
+    package (Closes: #585716).
+
  -- Modestas Vainius <modax at debian.org>  Sun, 04 Jul 2010 19:00:50 +0300
 
 kdebase-workspace (4:4.4.4-1) unstable; urgency=low

Modified: trunk/packages/kdebase-workspace/debian/control
===================================================================
--- trunk/packages/kdebase-workspace/debian/control	2010-07-04 16:11:40 UTC (rev 18431)
+++ trunk/packages/kdebase-workspace/debian/control	2010-07-05 12:12:40 UTC (rev 18432)
@@ -79,10 +79,10 @@
  kaboom (>= 1.0.5), kdebase-workspace-kgreet-plugins (= ${binary:Version})
 Recommends: plasma-scriptengines, polkit-kde-1 | policykit-1-gnome
 Suggests: x11-xkb-utils
+Conflicts: kcontrol, libplasma1, libplasma2, libkfontinst4, ksplash
 Replaces: kdebase-bin (<< 4:4.0.0-1), kcontrol, kmenuedit, ktip, libplasma2,
  kde-window-manager (<< 4:4.1.80), kdebase-workspace-data (<< 4:4.1.82),
- kdebase-workspace-libs4+5, libkfontinst4
-Conflicts: kcontrol, libplasma1, libplasma2, libkfontinst4
+ kdebase-workspace-libs4+5, libkfontinst4, ksplash
 Description: core binaries for the KDE 4 base workspace module
  This package contains miscellaneous programs needed for a basic KDE 4 desktop
  installation. Among other standard KDE 4 desktop components, the package