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

[Armin Berres]

Author: trigger-guest
Date: 2007-12-20 14:31:07 +0000 (Thu, 20 Dec 2007)
New Revision: 8311

Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
Log:
maybe one day an update from kde 3 to kde 4 will be no more such a PITA...

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2007-12-19 23:59:20 UTC (rev 8310)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2007-12-20 14:31:07 UTC (rev 8311)
@@ -6,12 +6,17 @@
   * Let kdebase-workspace-bin depend on the source and not the binary version
     of kdebase-workspace-data.
   * Make dependency of libplasma1 on kdebase-workspace-data versioned.
+  * Add conflict of kdebase-workspace-data with ksmserver to force its
+    removal.
+  * kdebase-workspace-bin and kdebase-workspace-data replace kdebase-bin and
+    kmenuedit from KDE 3.
+  * kdebase-workspace-data replaces kdebase-data from KDE 3.
 
   +++ Changes by Modestas Vainius:
 
   * Add myself to uploaders.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 19 Dec 2007 16:28:39 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Dec 2007 15:26:10 +0100
 
 kdebase-workspace (4:3.97.0-2) experimental; urgency=low
 

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2007-12-19 23:59:20 UTC (rev 8310)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2007-12-20 14:31:07 UTC (rev 8311)
@@ -28,6 +28,8 @@
 Package: kdebase-workspace-bin
 Section: kde
 Architecture: any
+Replaces: kdebase-bin (<< 4:3.93.0), kcontrol, kmenuedit
+Conflicts: kcontrol, kmenuedit
 Depends: ${shlibs:Depends}, kdebase-workspace-data (= ${source:Version}),
  dbus-x11
 Description: core binaries for the KDE base module
@@ -40,6 +42,8 @@
 Package: kdebase-workspace-data
 Section: kde
 Architecture: all
+Conflicts: ksmserver, kmenuedit
+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
  for a basic KDE desktop installation.