rev 8692 - branches/kde4/packages/kdebase-workspace/debian

[Armin Berres]

Author: trigger-guest
Date: 2008-01-02 11:01:35 +0000 (Wed, 02 Jan 2008)
New Revision: 8692

Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
Log:
* Make kdebase-workspace-data conflict with KDE 3's kdebase-data.

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-02 10:15:24 UTC (rev 8691)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-02 11:01:35 UTC (rev 8692)
@@ -1,3 +1,9 @@
+kdebase-workspace (4:3.98.0~svn753247-2) UNRELEASED; urgency=low
+
+  * Make kdebase-workspace-data conflict with KDE 3's kdebase-data.
+
+ -- Armin Berres <trigger+debian at space-based.de>  Wed, 02 Jan 2008 11:57:57 +0100
+
 kdebase-workspace (4:3.98.0~svn753247-1) experimental; urgency=low
 
   * Svn snapshot of revision 753247.

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2008-01-02 10:15:24 UTC (rev 8691)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-01-02 11:01:35 UTC (rev 8692)
@@ -42,7 +42,7 @@
 Package: kdebase-workspace-data
 Section: kde
 Architecture: all
-Conflicts: ksmserver, kmenuedit
+Conflicts: ksmserver, kmenuedit, kdebase-data (<< 4:3.90.1)
 Replaces: ksmserver, kdebase-bin (<< 4:3.93.0), kdebase-data (<< 4:3.93.0), kmenuedit
 Description: shared data files for the KDE base module
  This package contains the architecture-independent shared data files needed