[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.10.5-1-3-ge366d9b

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit e366d9b05ad50d9c9c4fb3d54206e753abe76e3b
Author: Pino Toscano <pino at debian.org>
Date:   Fri Jul 19 15:51:21 2013 +0200

    plasma-runners-addons: fix the conflicting version of kamoso
---
 debian/changelog |    2 ++
 debian/control   |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d21739b..99b6535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kdeplasma-addons (4:4.10.5-2) UNRELEASED; urgency=low
 
   [ Pino Toscano ]
   * Drop patch marble-4.7-compat.diff, obsolete now.
+  * Fix the conflicting version of kamoso in plasma-runners-addons, since
+    2.0.2-2 does not provide common files anymore.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 13 Jul 2013 15:34:16 +0200
 
diff --git a/debian/control b/debian/control
index b47b2b2..ca8a83e 100644
--- a/debian/control
+++ b/debian/control
@@ -131,8 +131,8 @@ Package: plasma-runners-addons
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: kamoso (<< 2.0.2+)
-Replaces: kamoso (<< 2.0.2+)
+Breaks: kamoso (<< 2.0.2-2)
+Replaces: kamoso (<< 2.0.2-2)
 Description: additional runners for Plasma and Krunner
  This package contains additional Plasma runners that are used in krunner
  (the "run command" dialog of Plasma) to reveal special search results.

-- 
KDE Plasma Addons module packaging