rev 18007 - trunk/packages/meta-kde/debian

[Modestas Vainius]

Author: modax
Date: 2010-05-17 19:29:07 +0000 (Mon, 17 May 2010)
New Revision: 18007

Modified:
   trunk/packages/meta-kde/debian/changelog
   trunk/packages/meta-kde/debian/control
Log:
Add versioned conflicts against previous proper kde-minimal package to all
KDE metapackage. Hopefully this helps apt/aptitude to make better choices
when upgrading to KDE SC 4.4.

Modified: trunk/packages/meta-kde/debian/changelog
===================================================================
--- trunk/packages/meta-kde/debian/changelog	2010-05-17 08:13:36 UTC (rev 18006)
+++ trunk/packages/meta-kde/debian/changelog	2010-05-17 19:29:07 UTC (rev 18007)
@@ -1,3 +1,11 @@
+meta-kde (5:61) UNRELEASED; urgency=emergency
+
+  * Add versioned conflicts against previous proper kde-minimal package to all
+    KDE metapackage. Hopefully this helps apt/aptitude to make better choices
+    when upgrading to KDE SC 4.4.
+
+ -- Modestas Vainius <modax at debian.org>  Mon, 17 May 2010 20:14:46 +0300
+
 meta-kde (5:60) unstable; urgency=low
 
   * Lower MINIMUM_KDE_VERSION to 4.3. Otherwise whole KDE would have to migrate

Modified: trunk/packages/meta-kde/debian/control
===================================================================
--- trunk/packages/meta-kde/debian/control	2010-05-17 08:13:36 UTC (rev 18006)
+++ trunk/packages/meta-kde/debian/control	2010-05-17 19:29:07 UTC (rev 18007)
@@ -11,6 +11,7 @@
 Architecture: all
 Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version}) | kde-minimal
 Suggests: kde-l10n (>= ${kde:Version})
+Breaks: kde-minimal (<< 5:57)
 Description: the K Desktop Environment, base applications
  KDE is the powerful, integrated, and easy-to-use Free Software desktop
  platform and suite of applications.
@@ -23,6 +24,7 @@
 Depends: ${misc:Depends}, kdebase-runtime (>= ${kde:Version}),
  plasma-desktop (>= ${kde:Version}), kdebase-workspace (>= ${kde:Version}),
  kdebase-apps (>= ${kde:Version})
+Breaks: kde-minimal (<< 5:57)
 Recommends: kdm  (>= ${kde:Version}), xserver-xorg
 Suggests: kde-l10n (>= ${kde:Version})
 Breaks: kde-minimal (<< 5:57)
@@ -69,6 +71,7 @@
 Recommends: konq-plugins (>= ${konqPlugins:Version}), network-manager-kde
 Suggests: kde-l10n (>= ${kde:Version}), kde-plasma-desktop (>= ${source:Version}),
  kde-plasma-netbook (>= ${source:Version})
+Breaks: kde-minimal (<< 5:57)
 Description: the KDE Plasma Desktop and standard set of applications
  The KDE Software Compilation is the powerful, integrated, and easy-to-use Free
  Software desktop platform and suite of applications.
@@ -88,6 +91,7 @@
  kdetoys (>= ${kde:Version}), kdewebdev (>= ${kde:Version})
 Suggests: kde-l10n (>= ${kde:Version}), koffice ( >= 1:2.0.0), xorg
 Provides: kde-software-compilation
+Breaks: kde-minimal (<< 5:57)
 Description: the complete KDE Software Compilation for end users
  KDE is the powerful, integrated, and easy-to-use Free Software desktop
  platform and suite of applications.