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

[Modestas Vainius]

Author: modax
Date: 2010-05-17 19:35:30 +0000 (Mon, 17 May 2010)
New Revision: 18009

Modified:
   trunk/packages/meta-kde/debian/changelog
   trunk/packages/meta-kde/debian/control
Log:
* Kick kde-minimal from any alternative depends and replace it with
  kde-plasma-netbook. Hopefully, this will ease upgrades (definitely, won't
  make them worse) (Closes: #582004).
* Drop (temporary) kde-minimal provides.

Modified: trunk/packages/meta-kde/debian/changelog
===================================================================
--- trunk/packages/meta-kde/debian/changelog	2010-05-17 19:29:54 UTC (rev 18008)
+++ trunk/packages/meta-kde/debian/changelog	2010-05-17 19:35:30 UTC (rev 18009)
@@ -3,6 +3,10 @@
   * Add versioned conflicts against previous proper kde-minimal package to all
     KDE metapackage. Hopefully this would help apt/aptitude make better choices
     when upgrading to KDE SC 4.4.
+  * Kick kde-minimal from any alternative depends and replace it with
+    kde-plasma-netbook. Hopefully, this will ease upgrades (definitely, won't
+    make them worse) (Closes: #582004).
+  * Drop (temporary) kde-minimal provides.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 17 May 2010 20:14:46 +0300
 

Modified: trunk/packages/meta-kde/debian/control
===================================================================
--- trunk/packages/meta-kde/debian/control	2010-05-17 19:29:54 UTC (rev 18008)
+++ trunk/packages/meta-kde/debian/control	2010-05-17 19:35:30 UTC (rev 18009)
@@ -9,7 +9,7 @@
 
 Package: kdebase
 Architecture: all
-Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version}) | kde-minimal
+Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version}) | kde-plasma-netbook (>= ${source:Version})
 Suggests: kde-l10n (>= ${kde:Version})
 Breaks: kde-minimal (<< 5:57)
 Description: the K Desktop Environment, base applications
@@ -28,7 +28,6 @@
 Recommends: kdm  (>= ${kde:Version}), xserver-xorg
 Suggests: kde-l10n (>= ${kde:Version})
 Breaks: kde-minimal (<< 5:57)
-Provides: kde-minimal
 Description: the KDE Plasma Desktop and minimal set of applications
  KDE is the powerful, integrated, and easy-to-use Free Software desktop
  platform and suite of applications.
@@ -46,7 +45,6 @@
 Recommends: kdm  (>= ${kde:Version}), xserver-xorg
 Suggests: kde-l10n (>= ${kde:Version})
 Breaks: kde-minimal (<< 5:57)
-Provides: kde-minimal
 Description: the KDE Plasma Netbook and minimal set of applications
  KDE is the powerful, integrated, and easy-to-use Free Software desktop
  platform and suite of applications.
@@ -58,8 +56,8 @@
 
 Package: kde-standard
 Architecture: all
-Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version}) | kde-minimal, polkit-kde-1,
- ark (>= ${kde:Version}), dragonplayer (>= ${kde:Version}), gwenview (>= ${kde:Version}),
+Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version}) | kde-plasma-netbook (>= ${source:Version}),
+ polkit-kde-1, ark (>= ${kde:Version}), dragonplayer (>= ${kde:Version}), gwenview (>= ${kde:Version}),
  juk (>= ${kde:Version}), kate (>= ${kde:Version}), kcalc (>= ${kde:Version}),
  kmail (>= ${kde:Version}), akregator (>= ${kde:Version}), kaddressbook (>= ${kde:Version}),
  kdeplasma-addons (>= ${kde:Version}), knotes (>= ${kde:Version}),