[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 37ee3ea7beee5d32cddc552b19ff672f7f73a15d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 15 16:18:54 2013 -0300

    Make kde-workspace-bin Break+Replaces kdetouchpadenabler.
    
    It's already part of kde-workspace.
---
 debian/changelog |    4 +++-
 debian/control   |    5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b763613..deaf853 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +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.
 
  -- 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 e9a0c25..80cad51 100644
--- a/debian/control
+++ b/debian/control
@@ -124,10 +124,11 @@ 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) 
+ kdebase-runtime (<< 4:4.5), kdebase-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.7.2),
+ ktouchpadenabler
 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)
+ polkit-kde-1 (<< 0.99), ktouchpadenabler
 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

-- 
KDE Base Workspace module packaging