rev 13002 - branches/kde4.2/packages/kdebase-workspace/debian

[David Palacio]

Author: dpalacio-guest
Date: 2008-12-21 03:13:43 +0000 (Sun, 21 Dec 2008)
New Revision: 13002

Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/control
Log:
kdm conflicts with kdebase-data 4:3.5.9


Modified: branches/kde4.2/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/control	2008-12-21 00:21:29 UTC (rev 13001)
+++ branches/kde4.2/packages/kdebase-workspace/debian/control	2008-12-21 03:13:43 UTC (rev 13002)
@@ -220,7 +220,7 @@
  kdebase | x-session-manager | x-window-manager, xterm | x-terminal-emulator
 Suggests: kdepasswd
 Replaces: kdebase-workspace-data (<< 4:4.1.80), kdebase-workspace-bin (<< 4:4.1.80)
-Conflicts: desktop-base (<< 4.0.4)
+Conflicts: desktop-base (<< 4.0.4), kdebase-data (<< 4:4.0.0-1)
 Provides: x-display-manager
 Description: KDE Display Manager for X11
  KDM manages a collection of X servers running on local or remote machines.