rev 15247 - trunk/packages/kdeplasma-addons/debian

[Modestas Vainius]

Author: modax-guest
Date: 2009-07-13 09:40:39 +0000 (Mon, 13 Jul 2009)
New Revision: 15247

Modified:
   trunk/packages/kdeplasma-addons/debian/changelog
   trunk/packages/kdeplasma-addons/debian/control
Log:
+++ Changes by Sune Vuorela:
+++ Changes by Modestas Vainius:
* plasma-widgets-addons conflicts & replaces plasma-widget-weather.

Modified: trunk/packages/kdeplasma-addons/debian/changelog
===================================================================
--- trunk/packages/kdeplasma-addons/debian/changelog	2009-07-13 09:21:12 UTC (rev 15246)
+++ trunk/packages/kdeplasma-addons/debian/changelog	2009-07-13 09:40:39 UTC (rev 15247)
@@ -2,10 +2,17 @@
 
   * New upstream release candidate.
     - New fancy background things, marble, fractals.
+
+  +++ Changes by Sune Vuorela:
+
   * Drop patch to make it lancelot work with qt4.5, merged upstream
 
- -- Sune Vuorela <debian at pusling.com>  Sun, 12 Jul 2009 19:37:01 +0200
+  +++ Changes by Modestas Vainius:
 
+  * plasma-widgets-addons conflicts & replaces plasma-widget-weather.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 13 Jul 2009 12:39:34 +0300
+
 kdeplasma-addons (4:4.2.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdeplasma-addons/debian/control
===================================================================
--- trunk/packages/kdeplasma-addons/debian/control	2009-07-13 09:21:12 UTC (rev 15246)
+++ trunk/packages/kdeplasma-addons/debian/control	2009-07-13 09:40:39 UTC (rev 15247)
@@ -33,8 +33,8 @@
 Depends: ${shlibs:Depends}, plasma-dataengines-workspace,
  plasma-dataengines-addons (= ${binary:Version}),
 Recommends: plasma-widget-lancelot
-Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, plasma-applets-addons
-Conflicts: kdeplasma-addons-data, plasma-applets-addons
+Replaces: kdeplasma-addons (<= 4:4.1.87+svn905624-0r1), kdeplasma-addons-data, plasma-applets-addons, plasma-widget-weather
+Conflicts: kdeplasma-addons-data, plasma-applets-addons, plasma-widget-weather
 Description: addons for KDE 4 Plasma - widgets
  This package contains additional Plasma widgets shipped in the KDE 4 plasma
  addons module. Install it if you want a variety of widgets on your plasma