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

[Modestas Vainius]

Author: modax
Date: 2010-06-07 09:13:35 +0000 (Mon, 07 Jun 2010)
New Revision: 18288

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/control
Log:
Make kdebase-workspace-data replace & conflict with ksplash
(Closes: #584861).

Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2010-06-07 08:47:31 UTC (rev 18287)
+++ trunk/packages/kdebase-workspace/debian/changelog	2010-06-07 09:13:35 UTC (rev 18288)
@@ -1,3 +1,10 @@
+kdebase-workspace (4:4.4.4-2) UNRELEASED; urgency=low
+
+  * Make kdebase-workspace-data replace & conflict with ksplash
+    (Closes: #584861).
+
+ -- Modestas Vainius <modax at debian.org>  Mon, 07 Jun 2010 12:11:05 +0300
+
 kdebase-workspace (4:4.4.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdebase-workspace/debian/control
===================================================================
--- trunk/packages/kdebase-workspace/debian/control	2010-06-07 08:47:31 UTC (rev 18287)
+++ trunk/packages/kdebase-workspace/debian/control	2010-06-07 09:13:35 UTC (rev 18288)
@@ -96,10 +96,10 @@
 Architecture: all
 Depends: oxygencursors, ${misc:Depends}, ${perl:Depends}
 Conflicts: ksmserver, kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1),
- kmenuedit, ktip, libplasma1, systemsettings (<< 4:4.1.80)
+ kmenuedit, ktip, libplasma1, systemsettings (<< 4:4.1.80), ksplash
 Replaces: ksmserver, kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1),
  kmenuedit, ktip, kdebase-runtime-data (<< 4:4.1.3), kde-window-manager (<< 4:4.1.80),
- kdm (<< 4:4.2.0-3), systemsettings (<< 4:4.1.80)
+ kdm (<< 4:4.2.0-3), systemsettings (<< 4:4.1.80), ksplash
 Description: shared data files for the KDE 4 base workspace module
  This package contains architecture-independent shared data files needed for a
  basic KDE 4 desktop installation.