[SCM] KDE Base Workspace module packaging branch, kde4.10, updated. debian/4.10.2-2-22-g767ca06

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=767ca06

The following commit has been merged in the kde4.10 branch:
commit 767ca068701ceeb029e4c29eb31a7c20ec06e8e2
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 15 20:20:39 2013 -0300

    Create package ktouchpadenabler from this source.
    
    Remove previous commit Break+Replaces, create new package with proper
    Break+Replaces.
    
    Create install file and remove ktouchpadenabler's entries from kde-workspace-bin.
---
 debian/changelog                 |    4 ++--
 debian/control                   |   15 ++++++++++++---
 debian/kde-workspace-bin.install |    2 --
 debian/ktouchpadenabler.install  |    2 ++
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index deaf853..e8c352a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 kde-workspace (4:4.10.3-2) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Make kde-workspace-bin Break+Replaces kdetouchpadenabler. It's already
-    part of kde-workspace.
+  * Create package ktouchpadenabler from this source, as it has been merged
+    in it.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 15 May 2013 16:01:44 -0300
 
diff --git a/debian/control b/debian/control
index 80cad51..48903ef 100644
--- a/debian/control
+++ b/debian/control
@@ -124,11 +124,10 @@ Recommends: plasma-scriptengines, polkit-kde-1 (>= 0.99) | policykit-1-gnome,
  upower [linux-any]
 Suggests: x11-xkb-utils
 Replaces: kcontrol, ktip, libkfontinst4, ksplash, kdesktop,
- kdebase-runtime (<< 4:4.5), kdebase-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.7.2),
- ktouchpadenabler
+ kdebase-runtime (<< 4:4.5), kdebase-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.7.2)
 Breaks: kcontrol, ktip, libkfontinst4, kdesktop, ksplash,
  kdebase-runtime (<< 4:4.5), kdebase-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.7.2),
- polkit-kde-1 (<< 0.99), ktouchpadenabler
+ polkit-kde-1 (<< 0.99)
 Description: core binaries for the KDE Plasma Workspace
  This package contains miscellaneous programs needed for a basic desktop
  installation. Among other standard KDE Workspace components, the package
@@ -619,3 +618,13 @@ Depends: ${misc:Depends}, kde-workspace-dbg
 Description: transitional package for kde-workspace-dbg
  This is a dummy transitional package for kde-workspace-dbg and can be safely
  removed after the installation is complete.
+
+Package: ktouchpadenabler
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: ktouchpadenabler (<< 0.1.1-1), kde-workspace-bin (<< 4:4.10.3-2~)
+Replaces: ktouchpadenabler (<< 0.1.1-1), kde-workspace-bin (<< 4:4.10.3-2~)
+Description: kded daemon to enable/disable touchpad
+ ktouchpadenabler is a kded daemon to enable and disable the system's touchpad
+ by listening for XF86XK_TouchpadToggle, XF86XK_TouchpadOn, and
+ XF86XK_TouchpadOff key events.
diff --git a/debian/kde-workspace-bin.install b/debian/kde-workspace-bin.install
index e05effe..59d6853 100644
--- a/debian/kde-workspace-bin.install
+++ b/debian/kde-workspace-bin.install
@@ -57,7 +57,6 @@ usr/lib/kde4/kded_appmenu.so
 usr/lib/kde4/kded_kephal.so
 usr/lib/kde4/kded_keyboard.so
 usr/lib/kde4/kded_khotkeys.so
-usr/lib/kde4/kded_ktouchpadenabler.so
 usr/lib/kde4/kded_kwrited.so
 usr/lib/kde4/kded_powerdevil.so
 usr/lib/kde4/kded_randrmonitor.so
@@ -159,7 +158,6 @@ usr/share/kde4/services/kded/appmenu.desktop
 usr/share/kde4/services/kded/kephal.desktop
 usr/share/kde4/services/kded/keyboard.desktop
 usr/share/kde4/services/kded/khotkeys.desktop
-usr/share/kde4/services/kded/ktouchpadenabler.desktop
 usr/share/kde4/services/kded/kwrited.desktop
 usr/share/kde4/services/kded/powerdevil.desktop
 usr/share/kde4/services/kded/randrmonitor.desktop
diff --git a/debian/ktouchpadenabler.install b/debian/ktouchpadenabler.install
new file mode 100644
index 0000000..5b5a406
--- /dev/null
+++ b/debian/ktouchpadenabler.install
@@ -0,0 +1,2 @@
+/usr/lib/kde4/kded_ktouchpadenabler.so
+/usr/share/kde4/services/kded/ktouchpadenabler.desktop

-- 
KDE Base Workspace module packaging