[SCM] plasma-desktop packaging branch, kubuntu_wily_archive, updated. 3a6b48939932866f91dd1aa5fb01098251678a06

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 3a6b48939932866f91dd1aa5fb01098251678a06
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jul 2 09:44:16 2015 +0000

    fix conflicts-with-dependency depends plasma-desktop-data (<< 4:5.3.2-0ubuntu1)
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index be7b0ee..960194e 100644
--- a/debian/control
+++ b/debian/control
@@ -133,12 +133,12 @@ Recommends: bluedevil,
 Breaks: baloo-kf5 (<< 5.5),
         kde-config-touchpad,
         kde-touchpad,
-        plasma-desktop-data (<< 4:5.3.2-0ubuntu1),
+        plasma-desktop-data (<< 4:5.3.2-0ubuntu1~),
         plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
 Replaces: baloo-kf5 (<< 5.5),
           kde-config-touchpad,
           kde-touchpad,
-          plasma-desktop-data (<< 4:5.3.2-0ubuntu1),
+          plasma-desktop-data (<< 4:5.3.2-0ubuntu1~),
           plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
 Conflicts: kde-workspace-bin
 Description: Tools and widgets for the desktop

-- 
plasma-desktop packaging