Merge lp:~panfaust/kubuntu-packaging-next/plasma-workspace-work2 into lp:~kubuntu-packagers/kubuntu-packaging-next/plasma-workspace

[Jose Manuel Santamaria Lema]

Use Breaks instead of conflicts against kde-window-manager, kde-
workspace, kde-workspace-data, klipper. According to debian's policy
7.4 "Normally, Breaks should be used instead of Conflicts since
Conflicts imposes a stronger restriction on the ordering of package
installation or upgrade and can make it more difficult for the
package manager to find a correct solution to an upgrade or
installation problem, Breaks should be used". This is the case when
upgrading from debian\'s kde metapackages such as kde-standard or
kde-full, so this change is needed to make the upgrades from such
metapackages work better.

Unmerged revisions

55. By Jose Manuel Santamaria Lema on 2014-07-31

Use breaks instead of conflicts.

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-23 21:30:23 +0000
+++ debian/changelog	2014-07-31 17:18:22 +0000
@@ -43,6 +43,18 @@
     sddm-theme to resolve sddm's theme dependency, which then defacto makes a
     circular dependency.
 
+  [ José Manuel Santamaría Lema ]
+  * Use Breaks instead of conflicts against kde-window-manager, kde-
+    workspace, kde-workspace-data, klipper. According to debian's policy
+    7.4 "Normally, Breaks should be used instead of Conflicts since
+    Conflicts imposes a stronger restriction on the ordering of package
+    installation or upgrade and can make it more difficult for the
+    package manager to find a correct solution to an upgrade or
+    installation problem, Breaks should be used". This is the case when
+    upgrading from debian\'s kde metapackages such as kde-standard or
+    kde-full, so this change is needed to make the upgrades from such
+    metapackages work better.
+
  -- Jonathan Riddell <[e-mail]>  Thu, 10 Jul 2014 20:06:06 +0200
 
 plasma-workspace (4:4.98.0-0ubuntu1) utopic; urgency=medium
 
=== modified file 'debian/control'
--- debian/control	2014-07-23 21:31:11 +0000
+++ debian/control	2014-07-31 17:18:22 +0000
@@ -164,7 +164,10 @@
          x11-xserver-utils,
          ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: kde-window-manager, kde-workspace, kde-workspace-data, klipper
+Breaks: kde-window-manager (<< 4:5.0.0),
+        kde-workspace (<< 4:5.0.0),
+        kde-workspace-data (<< 4:5.0.0),
+        klipper (<< 4:5.0.0)
 Replaces: klipper, plasma-workspace-data
 Description: Plasma Workspace for KF5
  Plasma Workspace for KF5. Workspaces provide