rev 8549 - trunk/packages/kdebase/debian

[Armin Berres]

Author: trigger-guest
Date: 2007-12-26 12:06:09 +0000 (Wed, 26 Dec 2007)
New Revision: 8549

Modified:
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/control.in
Log:
s/Conflicts/Replaces/

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2007-12-26 12:02:42 UTC (rev 8548)
+++ trunk/packages/kdebase/debian/control	2007-12-26 12:06:09 UTC (rev 8549)
@@ -196,7 +196,7 @@
 Section: utils
 Architecture: all
 Depends: eject
-Conflicts: kdesktop (<< 4:3.5.8.dfsg.1-3)
+Replaces: kdesktop (<< 4:3.5.8.dfsg.1-3)
 Description: script used by KDE to eject removable media
  This package provides a shell script called 'kdeeject' which is used
  by a few other  kdebase components to eject removable media like

Modified: trunk/packages/kdebase/debian/control.in
===================================================================
--- trunk/packages/kdebase/debian/control.in	2007-12-26 12:02:42 UTC (rev 8548)
+++ trunk/packages/kdebase/debian/control.in	2007-12-26 12:06:09 UTC (rev 8549)
@@ -196,7 +196,7 @@
 Section: utils
 Architecture: all
 Depends: eject
-Conflicts: kdesktop (<< 4:3.5.8.dfsg.1-3)
+Replaces: kdesktop (<< 4:3.5.8.dfsg.1-3)
 Description: script used by KDE to eject removable media
  This package provides a shell script called 'kdeeject' which is used
  by a few other  kdebase components to eject removable media like