[SCM] plasma-desktop packaging branch, kubuntu_wily_archive, updated. 0b6adc0a066d068bd8b2bb7eb203402a968ab5f0

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 0b6adc0a066d068bd8b2bb7eb203402a968ab5f0
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Jul 1 15:56:35 2015 +0000

    replace old plasma-desktop-data for /usr/share/config.kcfg/touchpad.kcfg
---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index 08d64f5..be7b0ee 100644
--- a/debian/control
+++ b/debian/control
@@ -133,10 +133,12 @@ Recommends: bluedevil,
 Breaks: baloo-kf5 (<< 5.5),
         kde-config-touchpad,
         kde-touchpad,
+        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-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
 Conflicts: kde-workspace-bin
 Description: Tools and widgets for the desktop

-- 
plasma-desktop packaging