[SCM] plasma-desktop packaging branch, master, updated. debian/5.3.2-1-3-g2780a78

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit 2780a78f9eddc91159ffa349d1e5c9086c647073
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Jul 25 16:56:06 2015 +0200

    Make Breaks/Replaces against kde-touchpad and kde-config-touchpad versioned.
    
    They are transitional packages now.
    Closes: #793568
---
 debian/changelog |  6 ++++++
 debian/control   | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9da97f6..1d12374 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 plasma-desktop (4:5.3.2-2~) UNRELEASED; urgency=medium
 
+  [ Maximiliano Curia ]
   * Add missing Breaks/Replaces. (Closes: #791891) Thanks to Andreas
     Beckman
 
+  [ Felix Geyer ]
+  * Make Breaks/Replaces against kde-touchpad and kde-config-touchpad
+    versioned. (Closes: #793568)
+    They are transitional packages now.
+
  -- Maximiliano Curia <maxy at debian.org>  Thu, 09 Jul 2015 13:06:00 +0200
 
 plasma-desktop (4:5.3.2-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 5b3266d..673f198 100644
--- a/debian/control
+++ b/debian/control
@@ -79,8 +79,8 @@ Depends: libkfontinst5 (= ${binary:Version}),
          plasma-desktop (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: kde-config-touchpad (<< ${source:Version}), kde-touchpad (<< 5.1.95~)
-Replaces: kde-config-touchpad (<< ${source:Version}), kde-touchpad (<< 5.1.95~)
+Breaks: kde-config-touchpad (<< 4:5), kde-touchpad (<< 5.1.95~)
+Replaces: kde-config-touchpad (<< 4:5), kde-touchpad (<< 5.1.95~)
 Description: Tools and widgets for the desktop
  Plasma Desktop offers a beautiful looking desktop
  that takes complete advantage of modern computing technology.
@@ -131,12 +131,12 @@ Recommends: bluedevil,
             systemsettings,
             user-manager
 Breaks: baloo-kf5 (<< 5.5),
-        kde-config-touchpad,
-        kde-touchpad,
+        kde-config-touchpad (<< 4:5),
+        kde-touchpad (<< 5.1.95~),
         plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
 Replaces: baloo-kf5 (<< 5.5),
-          kde-config-touchpad,
-          kde-touchpad,
+          kde-config-touchpad (<< 4:5),
+          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
@@ -203,11 +203,11 @@ Recommends: plasma-framework,
 Conflicts: kde-workspace-bin, kde-workspace-data
 Breaks: baloo-kf5 (<< 5.5),
         plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
-        kde-config-touchpad,
+        kde-config-touchpad (<< 4:5),
         ${kde-l10n:all}
 Replaces: baloo-kf5 (<< 5.5),
           plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
-          kde-config-touchpad,
+          kde-config-touchpad (<< 4:5),
           ${kde-l10n:all}
 Description: Tools and widgets for the desktop data files
  Plasma Desktop offers a beautiful looking desktop

-- 
plasma-desktop packaging