[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=ed2a901

The following commit has been merged in the master branch:
commit ed2a901ce6bd98a9c78df50a7a42a222cfe2c27d
Author: Alessandro Ghersi <alessandro-ghersi at kubuntu.org>
Date:   Sat Dec 12 04:00:57 2009 +0100

    Make plasma-widgets-addons conflict/replace on plasma-widget-spellcheck
---
 debian/changelog | 6 ++++++
 debian/control   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c48717..c090788 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdeplasma-addons (4:4.3.80-0ubuntu6) UNRELEASED; urgency=low
+
+  * Make plasma-widgets-addons conflict/replace on plasma-widget-spellcheck
+
+ -- Alessandro Ghersi <alessandro-ghersi at kubuntu.org>  Sat, 12 Dec 2009 03:59:19 +0100
+
 kdeplasma-addons (4:4.3.80-0ubuntu5) lucid; urgency=low
 
   * Remove 99_fix_ftbfs_on_marble_wallpaper.diff, fixes fail to build
diff --git a/debian/control b/debian/control
index 558603a..1066a18 100644
--- a/debian/control
+++ b/debian/control
@@ -37,8 +37,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, plasma-widget-weather,
- plasma-widget-plasmaboard
-Conflicts: kdeplasma-addons-data, plasma-applets-addons, plasma-widget-plasmaboard
+ plasma-widget-plasmaboard, plasma-widget-spellcheck
+Conflicts: kdeplasma-addons-data, plasma-applets-addons, plasma-widget-plasmaboard, plasma-widget-spellcheck
 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

-- 
KDE Plasma Addons module packaging