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

[Armin Berres]

Author: trigger-guest
Date: 2008-01-14 13:01:05 +0000 (Mon, 14 Jan 2008)
New Revision: 8954

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
   branches/kde4/packages/kdebase/debian/changelog
   branches/kde4/packages/kdebase/debian/control
Log:
some conflicts. we may need more

Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog	2008-01-14 12:59:18 UTC (rev 8953)
+++ branches/kde4/packages/kdebase/debian/changelog	2008-01-14 13:01:05 UTC (rev 8954)
@@ -3,7 +3,7 @@
   +++ Changes by Armin Berres:
 
   * KWrite ships files which are contained in kate from KDE 3. Add
-    replaces.
+    conflict and replaces.
 
   +++ Changes by Matthew Rosewarne:
 

Modified: branches/kde4/packages/kdebase/debian/control
===================================================================
--- branches/kde4/packages/kdebase/debian/control	2008-01-14 12:59:18 UTC (rev 8953)
+++ branches/kde4/packages/kdebase/debian/control	2008-01-14 13:01:05 UTC (rev 8954)
@@ -166,6 +166,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: kate (<< 4:4.0.0)
+Conflicts: kate (<< 4:4.0.0)
 Description: text editor for KDE
  KWrite is the KDE simple text editor.  It uses the Kate editor component, so
  it supports powerful features such as flexible syntax highlighting, automatic

Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog	2008-01-14 12:59:18 UTC (rev 8953)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2008-01-14 13:01:05 UTC (rev 8954)
@@ -2,7 +2,7 @@
 
   +++ Changes by Armin Berres:
 
-  * Add replaces for a smoother upgrade.
+  * Add conflicts and replaces for a smoother upgrade.
 
   +++ Changes by Fathi Boudra:
 

Modified: branches/kde4/packages/kdebase-runtime/debian/control
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/control	2008-01-14 12:59:18 UTC (rev 8953)
+++ branches/kde4/packages/kdebase-runtime/debian/control	2008-01-14 13:01:05 UTC (rev 8954)
@@ -58,7 +58,7 @@
 Section: kde
 Architecture: all
 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)
+Conflicts: kdebase-bin (<< 4:4.0.0), 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
  to run KDE applications.

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-14 12:59:18 UTC (rev 8953)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-14 13:01:05 UTC (rev 8954)
@@ -2,7 +2,7 @@
 
   * Install kdm-np insto /etc/pam.d/ to get working auto-login.
   * Install documentation how to use kwin with composite.
-  * Add replaces for a smoother upgrade.
+  * Add conflicts and 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-14 12:59:18 UTC (rev 8953)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-01-14 13:01:05 UTC (rev 8954)
@@ -47,7 +47,7 @@
 Package: kdebase-workspace-data
 Section: kde
 Architecture: all
-Conflicts: ksmserver, kmenuedit, kdebase-data (<< 4:3.90.1), ktip
+Conflicts: ksmserver, kdebase-bin (<< 4:3.93.0), kdebase-data (<< 4:3.90.1), kmenuedit, 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