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

[Armin Berres]

Author: trigger-guest
Date: 2007-09-22 13:16:02 +0000 (Sat, 22 Sep 2007)
New Revision: 7238

Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
Log:
Add conflict of kdm with desktop-base << 4.0.4 because of missing
KdmGreeterTheme.desktop


Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2007-09-22 13:02:05 UTC (rev 7237)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2007-09-22 13:16:02 UTC (rev 7238)
@@ -4,9 +4,12 @@
 
   * Remove some Oxygen icons from ksysguard which are already shipped by kdebase-data
   * Port Debian specific settings and patches for kdm from KDE3
-  * Move kde.desktop into kdebase-workspace-data and install it in /usr/share/xsessions
+  * Add conflict of kdm with desktop-base << 4.0.4 because of missing
+    KdmGreeterTheme.desktop
+  * Move kde.desktop into kdebase-workspace-data and install it in
+    /usr/share/xsessions
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Sep 2007 14:54:58 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Sep 2007 15:12:13 +0200
 
 kdebase-workspace (4:3.93.0-2) experimental; urgency=low
 

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2007-09-22 13:02:05 UTC (rev 7237)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2007-09-22 13:16:02 UTC (rev 7238)
@@ -59,6 +59,7 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, xbase-clients
+Conflicts: desktop-base (<< 4.0.4)
 Provides: x-display-manager
 Description: X display manager for KDE
  kdm manages a collection of X servers, which may be on the local host or