[Pkg-kde-commits] rev 767 - branches/kde-3.4.0/packages/kdebase/debian

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-03-10 18:39:40 +0100 (Thu, 10 Mar 2005)
New Revision: 767

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/control
Log:
Change kdm/kdebase-bin Conflicts/Replaces since
we may fix the problem in Sarge as well.


Modified: branches/kde-3.4.0/packages/kdebase/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/control	2005-03-10 15:59:21 UTC (rev 766)
+++ branches/kde-3.4.0/packages/kdebase/debian/control	2005-03-10 17:39:40 UTC (rev 767)
@@ -88,7 +88,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Suggests: khelpcenter
-Conflicts: kdebase-libs (<< 4:3.0.0)
+Conflicts: kdebase-libs (<< 4:3.0.0), kdm (<< 4:3.3.2-2)
 Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0)
 Description: KDE Base (binaries)
  KDE is a powerful Open Source graphical desktop environment
@@ -219,7 +219,7 @@
 Depends: ${shlibs:Depends}, debconf (>= 1.2.9), libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate
 Suggests: khelpcenter
-Replaces: kdebase-bin (<< 4:3.4.0)
+Replaces: kdebase-bin (<< 4:3.3.2-2)
 Provides: x-display-manager
 Description: KDE Display Manager
  KDE is a powerful Open Source graphical desktop environment