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

[Felix Geyer]

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

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

    Make plasma-workspace break kde-window-manager (<= 4:5) instead of conflicting with it.
    
    kde-window-manager is a transitional package now.
---
 debian/changelog | 8 ++++++++
 debian/control   | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a93903..45abb35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+plasma-workspace (4:5.3.2-4) UNRELEASED; urgency=medium
+
+  * Make plasma-workspace break kde-window-manager (<= 4:5) instead
+    of conflicting with it.
+    kde-window-manager is a transitional package now.
+
+ -- Felix Geyer <fgeyer at debian.org>  Sat, 25 Jul 2015 16:17:06 +0200
+
 plasma-workspace (4:5.3.2-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 984382f..76ab1de 100644
--- a/debian/control
+++ b/debian/control
@@ -134,8 +134,8 @@ Depends: dbus-x11,
 Breaks: ${kde-l10n:all}, plasma-desktop (<= 4:5),
         kdeartwork-style, kdeartwork-theme-window, kscreensaver,
         kscreensaver-xsavers, kscreensaver-xsavers-webcollage,
-        plasma-desktopthemes-artwork
-Conflicts: kde-window-manager, kde-workspace, kde-workspace-data, klipper
+        plasma-desktopthemes-artwork, kde-window-manager (<= 4:5)
+Conflicts: kde-workspace, kde-workspace-data, klipper
 Replaces: klipper, plasma-workspace-data,
           ${kde-l10n:all}
 Description: Plasma Workspace for KF5

-- 
plasma-workspace packaging