[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=1fcecbd

The following commit has been merged in the master branch:
commit 1fcecbd405c993db8f6d5ac6776dd242fbcd803a
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Jan 27 14:22:13 2012 +0100

    plasma-widget-kimpanel conflicts/replaces plasma-widget-kimpanel-backend-ibus
    since the latter doesn't exist anymore.
---
 debian/changelog | 8 ++++++++
 debian/control   | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8ee220f..4d51a41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kdeplasma-addons (4:4.8.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * plasma-widget-kimpanel conflicts/replaces
+    plasma-widget-kimpanel-backend-ibus since the latter doesn't exist
+    anymore.
+
+ -- Felix Geyer <debfx at ubuntu.com>  Fri, 27 Jan 2012 14:20:42 +0100
+
 kdeplasma-addons (4:4.8.0-0ubuntu1) precise; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 5a46254..99f1076 100644
--- a/debian/control
+++ b/debian/control
@@ -116,7 +116,9 @@ Description: lancelot widget for Plasma
 Package: plasma-widget-kimpanel
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, plasma-widget-kimpanel-backend-ibus
+Depends: ${shlibs:Depends}
+Conflicts: plasma-widget-kimpanel-backend-ibus
+Replaces: plasma-widget-kimpanel-backend-ibus
 Description: addons for KDE 4 Plasma - universal input method widget
  Kimpanel is a Plasma widget for the ibus input method.
  .

-- 
KDE Plasma Addons module packaging