[SCM] plasma-desktop packaging branch, kubuntu_wily_archive, updated. ubuntu/4%5.3.2-0ubuntu1-3-g54d04ed

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=54d04ed

The following commit has been merged in the kubuntu_wily_archive branch:
commit 54d04edcd3d9a14b41a10b7e54b44625bab1fa63
Author: Philip Muškovac <yofel at gmx.net>
Date:   Sun Jul 26 21:27:44 2015 +0200

    add those breaks/replaces to plasma-desktop-data as well
---
 debian/changelog | 6 ++++++
 debian/control   | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21d95cd..af387d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plasma-desktop (4:5.3.2-0ubuntu3) wily; urgency=medium
+
+  * add those breaks/replaces to plasma-desktop-data as well
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Sun, 26 Jul 2015 21:26:47 +0200
+
 plasma-desktop (4:5.3.2-0ubuntu2) wily; urgency=medium
 
   * add versions to breaks/replaces for touchpad which have
diff --git a/debian/control b/debian/control
index d54e6f9..b7896ab 100644
--- a/debian/control
+++ b/debian/control
@@ -204,9 +204,13 @@ Recommends: plasma-framework,
             qml-module-qtquick-dialogs
 Conflicts: kde-workspace-bin, kde-workspace-data
 Breaks: baloo-kf5 (<< 5.5),
-        plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
+        plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
+        kde-config-touchpad (<< ${source:Version}),
+        kde-touchpad (<< ${source:Version})
 Replaces: baloo-kf5 (<< 5.5),
-          plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
+          plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
+        kde-config-touchpad (<< ${source:Version}),
+        kde-touchpad (<< ${source:Version})
 Description: Tools and widgets for the desktop data files
  Plasma Desktop offers a beautiful looking desktop
  that takes complete advantage of modern computing technology.

-- 
plasma-desktop packaging