[SCM] plasma-desktop packaging branch, master, updated. debian/5.4.0-3-18-g67fa898

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d1282763fc4dabb94c954ab497dd72bdd93944e9
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Sep 9 16:36:16 2015 +0200

    Add a missing Breaks/Replaces.
---
 debian/control | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 9523ee5..440b463 100644
--- a/debian/control
+++ b/debian/control
@@ -136,14 +136,17 @@ Recommends: bluedevil,
 Breaks: baloo-kf5 (<< 5.5),
         kde-config-touchpad (<< 4:5),
         kde-touchpad (<< 5.1.95~),
+        kde-workspace-bin,
+        kde-workspace-data,
         plasma-desktop-data (<< 4:5.3.2-0ubuntu1~),
         plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
 Replaces: baloo-kf5 (<< 5.5),
           kde-config-touchpad (<< 4:5),
           kde-touchpad (<< 5.1.95~),
+          kde-workspace-bin,
+          kde-workspace-data,
           plasma-desktop-data (<< 4:5.3.2-0ubuntu1~),
           plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
-Conflicts: kde-workspace-bin
 Description: Tools and widgets for the desktop
  Plasma Desktop offers a beautiful looking desktop
  that takes complete advantage of modern computing technology.
@@ -205,15 +208,18 @@ Recommends: plasma-framework,
             qml-module-org-kde-extensionplugin,
             qml-module-org-kde-kwindowsystem,
             qml-module-qtquick-dialogs
-Conflicts: kde-workspace-bin, kde-workspace-data
 Breaks: baloo-kf5 (<< 5.5),
         kde-config-touchpad (<< 4:5),
         kde-touchpad (<< 5.1.95~),
+        kde-workspace-bin,
+        kde-workspace-data,
         plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
         ${kde-l10n:all}
 Replaces: baloo-kf5 (<< 5.5),
           kde-config-touchpad (<< 4:5),
           kde-touchpad (<< 5.1.95~),
+          kde-workspace-bin,
+          kde-workspace-data,
           plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
           ${kde-l10n:all}
 Description: Tools and widgets for the desktop data files

-- 
plasma-desktop packaging