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

[Modestas Vainius]

Author: modax-guest
Date: 2008-11-07 21:17:09 +0000 (Fri, 07 Nov 2008)
New Revision: 12606

Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
Log:
Remove kdebase-runtime-data from kdebase-workspace-data Conflicts

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-11-07 21:02:23 UTC (rev 12605)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-11-07 21:17:09 UTC (rev 12606)
@@ -5,8 +5,10 @@
   * Replace kdepimlibs5-dev with kdelibs5-dev everywhere (should be enough).
   * Bump build dependency on kdelibs5-dev to 4.1.3-2.
   * Exclude kdebase-runtime from libplasma2 Depends.
+  * Remove kdebase-runtime-data from kdebase-workspace-data Conflicts.
+    Leave Replaces though.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 07 Nov 2008 23:01:15 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 07 Nov 2008 23:16:16 +0200
 
 kdebase-workspace (4:4.1.3-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2008-11-07 21:02:23 UTC (rev 12605)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-11-07 21:17:09 UTC (rev 12606)
@@ -65,7 +65,7 @@
 Architecture: all
 Depends: oxygencursors
 Conflicts: ksmserver, kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1),
- kmenuedit, ktip, libplasma1, kdebase-runtime-data (<<4:4.1.3)
+ kmenuedit, ktip, libplasma1
 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)
 Description: shared data files for the KDE 4 base workspace module