rev 8944 - in branches/kde4/packages: kdebase-runtime/debian kdebase-workspace/debian

[Armin Berres]

Author: trigger-guest
Date: 2008-01-13 22:04:57 +0000 (Sun, 13 Jan 2008)
New Revision: 8944

Modified:
   branches/kde4/packages/kdebase-runtime/debian/changelog
   branches/kde4/packages/kdebase-runtime/debian/control
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
Log:
* Add replaces for a smoother upgrade.

Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog	2008-01-13 15:24:09 UTC (rev 8943)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2008-01-13 22:04:57 UTC (rev 8944)
@@ -1,3 +1,9 @@
+kdebase-runtime (4:4.0.0-2) UNRELEASED; urgency=low
+
+  * Add replaces for a smoother upgrade.
+
+ -- Armin Berres <trigger+debian at space-based.de>  Sun, 13 Jan 2008 22:35:00 +0100
+
 kdebase-runtime (4:4.0.0-1) experimental; urgency=low
 
   * New upstream release.

Modified: branches/kde4/packages/kdebase-runtime/debian/control
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/control	2008-01-13 15:24:09 UTC (rev 8943)
+++ branches/kde4/packages/kdebase-runtime/debian/control	2008-01-13 22:04:57 UTC (rev 8944)
@@ -56,7 +56,7 @@
 Package: kdebase-runtime-data-common
 Section: kde
 Architecture: all
-Replaces: kdebase-runtime-data, kdebase-data
+Replaces: kdebase-runtime-data (<< 4:4.0.0), kdebase-data (<< 4:4.0.0), kdebase-bin (<< 4:4.0.0)
 Conflicts: kdebase-data (<< 4:3.90.1)
 Description: shared data files for the KDE base runtime module 
  This package contains the architecture-independent shared data files needed

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-13 15:24:09 UTC (rev 8943)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-13 22:04:57 UTC (rev 8944)
@@ -1,7 +1,8 @@
 kdebase-workspace (4:4.0.0-3) UNRELEASED; urgency=low
 
   * Install kdm-np insto /etc/pam.d/ to get working auto-login.
-  * Install documentation how to use kwin with composite. 
+  * Install documentation how to use kwin with composite.
+  * Add replaces for a smoother upgrade.
 
  -- Armin Berres <trigger+debian at space-based.de>  Fri, 11 Jan 2008 21:50:17 +0100
 

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2008-01-13 15:24:09 UTC (rev 8943)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-01-13 22:04:57 UTC (rev 8944)
@@ -36,8 +36,8 @@
 Depends: ${shlibs:Depends}, kdebase-workspace-data (= ${source:Version}),
  dbus-x11, x11-utils, x11-xserver-utils
 Suggests: x11-xkb-utils
-Replaces: kdebase-bin (<< 4:3.93.0), kcontrol, kmenuedit
-Conflicts: kcontrol, kmenuedit
+Replaces: kdebase-bin (<< 4:3.93.0), kcontrol, kmenuedit, ktip
+Conflicts: kcontrol
 Description: core binaries for the KDE base module
  This package contains miscellaneous programs needed for a basic KDE desktop
  installation.
@@ -47,8 +47,8 @@
 Package: kdebase-workspace-data
 Section: kde
 Architecture: all
-Conflicts: ksmserver, kmenuedit, kdebase-data (<< 4:3.90.1)
-Replaces: ksmserver, kdebase-bin (<< 4:3.93.0), kdebase-data (<< 4:3.93.0), kmenuedit
+Conflicts: ksmserver, kmenuedit, kdebase-data (<< 4:3.90.1), ktip
+Replaces: ksmserver, kdebase-bin (<< 4:3.93.0), kdebase-data (<< 4:3.93.0), kmenuedit, ktip
 Description: shared data files for the KDE base module
  This package contains architecture-independent shared data files needed for a
  basic KDE desktop installation.