[SCM] plasma-desktop packaging branch, kubuntu_unstable, updated. a26a496f773087ecacfb1963b5649d38463d77af

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit a26a496f773087ecacfb1963b5649d38463d77af
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Feb 26 09:01:56 2015 +0100

    kcm-touchpad is now part of plasma-desktop
---
 debian/control | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 33c4350..cbd32d5 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Build-Depends: baloo-kf5-dev (>= 5.1.95),
                libusb-dev,
                libxapian-dev,
                libxcb-image0-dev,
+               libxcb-record0-dev,
                libxcb-xkb-dev,
                libxcursor-dev,
                libxft-dev,
@@ -86,7 +87,6 @@ Depends: breeze,
 Recommends: bluedevil,
             kde-config-gtk-style,
             kde-config-sddm,
-            kde-config-touchpad,
             kde-style-oxygen-qt5,
             khelpcenter,
             khotkeys,
@@ -107,8 +107,12 @@ Recommends: bluedevil,
             ttf-oxygen-font-family,
             user-manager
 Breaks: baloo-kf5 (<< 5.5),
+        kde-config-touchpad (<< 4:5.2.50),
+        kde-touchpad (<< 5.1.95~),
         plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
 Replaces: baloo-kf5 (<< 5.5),
+          kde-config-touchpad (<< 4:5.2.50),
+          kde-touchpad (<< 5.1.95~),
           plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
 Conflicts: kde-workspace-bin
 Description: Tools and widgets for the desktop
@@ -171,6 +175,15 @@ Description: Tools and widgets for the desktop data files
  .
  This package contains the data files
 
+Package: kde-touchpad
+Architecture: any
+Depends: plasma-desktop
+Section: oldlibs
+Priority: extra
+Description: transitional package
+ Transitional package for kde-touchpad, this package can be
+ safely removed.
+
 Package: plasma-desktop-dbg
 Section: debug
 Architecture: any

-- 
plasma-desktop packaging