[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=ac5d907

The following commit has been merged in the master branch:
commit ac5d9073e9e03287d2fa894b9447c8af85101933
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Wed Dec 9 13:27:09 2009 +0000

    sync with archive
---
 debian/changelog | 16 +++++++++++++---
 debian/control   |  5 +++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c729a00..6cad405 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+kdeplasma-addons (4:4.3.80-0ubuntu4) lucid; urgency=low
+
+  * Fix libkexiv2 build-dep to libkexiv2-8
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 08 Dec 2009 15:31:07 -0500
+
+kdeplasma-addons (4:4.3.80-0ubuntu3) lucid; urgency=low
+
+  * Make plasma-widget-addons conflict/replace on plasma-widget-plasmaboard,
+    which moved here in KDE 4.4
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org>  Tue, 08 Dec 2009 15:31:07 -0500
+
 kdeplasma-addons (4:4.3.80-0ubuntu2) lucid; urgency=low
 
   [ Michał Zając ]
@@ -6,9 +19,6 @@ kdeplasma-addons (4:4.3.80-0ubuntu2) lucid; urgency=low
   [ Scott Kitterman ]
   * Revert mistaken liblancelot1 transition and return to liblancelot0
 
-  [ Jonathan Riddell ]
-  * Fix libkexiv2 build-dep to libkexiv2-8
-
  -- Scott Kitterman <scott at kitterman.com>  Sun, 06 Dec 2009 21:42:35 -0500
 
 kdeplasma-addons (4:4.3.80-0ubuntu1) lucid; urgency=low
diff --git a/debian/control b/debian/control
index ec1a63e..558603a 100644
--- a/debian/control
+++ b/debian/control
@@ -36,8 +36,9 @@ Section: kde
 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
-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,
+ plasma-widget-plasmaboard
+Conflicts: kdeplasma-addons-data, plasma-applets-addons, plasma-widget-plasmaboard
 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