[SCM] plasma-desktop packaging branch, master, updated. 4e0e95e7ee54e2c753cdee55d5ca84b40b1327f9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a298e5d4e38fc13731aec4fd9afcdaa94e022b52
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon May 18 13:10:06 2015 +0200

    Breaks/Replaces older touchpad supports.
---
 debian/control                | 5 ++++-
 debian/plasma-desktop.install | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 130985c..48eecc4 100644
--- a/debian/control
+++ b/debian/control
@@ -110,7 +110,6 @@ Recommends: bluedevil,
             fonts-oxygen,
             kde-config-gtk-style,
             kde-config-sddm,
-            kde-config-touchpad,
             kde-style-oxygen-qt5,
             khelpcenter,
             khotkeys,
@@ -130,8 +129,12 @@ Recommends: bluedevil,
             systemsettings,
             user-manager
 Breaks: baloo-kf5 (<< 5.5),
+        kde-config-touchpad,
+        kde-touchpad,
         plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
 Replaces: baloo-kf5 (<< 5.5),
+          kde-config-touchpad,
+          kde-touchpad,
           plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
 Conflicts: kde-workspace-bin
 Description: Tools and widgets for the desktop
diff --git a/debian/plasma-desktop.install b/debian/plasma-desktop.install
index c39637d..1760e97 100644
--- a/debian/plasma-desktop.install
+++ b/debian/plasma-desktop.install
@@ -12,5 +12,5 @@ usr/lib/*/libexec
 usr/lib/*/libkdeinit5_kaccess.so
 usr/lib/*/qt5
 usr/share/applications/
-usr/share/config.kcfg/touchpaddaemon.kcfg
 usr/share/config.kcfg/touchpad.kcfg
+usr/share/config.kcfg/touchpaddaemon.kcfg

-- 
plasma-desktop packaging