[SCM] kcm-touchpad packaging branch, kubuntu_stable, updated. 846fa581fd1587a29bfbfe8ed586d6940dbce4e2

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kcm-touchpad.git;a=commitdiff;h=846fa58

The following commit has been merged in the kubuntu_stable branch:
commit 846fa581fd1587a29bfbfe8ed586d6940dbce4e2
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Mar 9 20:49:21 2015 +0100

    Add kubuntu_disable-applet.diff to not install broken applet
---
 debian/changelog                           |  6 ++++++
 debian/patches/kubuntu_disable-applet.diff | 20 ++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 132b772..b28eb8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kcm-touchpad (4:5.1.95-0ubuntu3) vivid; urgency=medium
+
+  * Add kubuntu_disable-applet.diff to not install broken applet
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 09 Mar 2015 20:41:40 +0100
+
 kcm-touchpad (4:5.1.95-0ubuntu2) vivid; urgency=medium
 
   * Add transitional package for kde-touchpad
diff --git a/debian/patches/kubuntu_disable-applet.diff b/debian/patches/kubuntu_disable-applet.diff
new file mode 100644
index 0000000..5c294e3
--- /dev/null
+++ b/debian/patches/kubuntu_disable-applet.diff
@@ -0,0 +1,20 @@
+Description: don't install broken applet
+Author: Jonathan Riddell
+Origin: me
+Forwarded: no, upstream fixed it in Plasma 5.3
+Last-Update: 2015-03-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: kcm-touchpad-5.1.95/src/CMakeLists.txt
+===================================================================
+--- kcm-touchpad-5.1.95.orig/src/CMakeLists.txt
++++ kcm-touchpad-5.1.95/src/CMakeLists.txt
+@@ -68,8 +68,6 @@ target_link_libraries(kded_touchpad
+ 		      Qt5::X11Extras
+ )
+ 
+-add_subdirectory(applet)
+-
+ install(FILES kcm/kcm_touchpad.desktop
+         DESTINATION ${SERVICES_INSTALL_DIR}
+ )
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9989d22
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_disable-applet.diff

-- 
kcm-touchpad packaging