[SCM] plasma-desktop packaging branch, kubuntu_unstable, updated. debian/5.4.3-1-53-gb6543bf

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b6543bfaa72e53ad0c3f64d3eb1808e78075f3f6
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Mar 1 07:49:49 2016 -0800

    Add breaks/replaces for new conflicting files due to kactivities split.
---
 debian/changelog | 3 +++
 debian/control   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8d23a28..17173fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ plasma-desktop (4:5.5.4-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream release
   * Removing patch upstream_fix_panel_shrinking.diff as it is now fixed in 5.5.4
 
+  [ Scarlett Clark ]
+  * Add breaks/replaces for new conflicting files due to kactivities split. 
+
  -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:16:04 +0000
 
 plasma-desktop (4:5.4.3-2) UNRELEASED; urgency=medium
diff --git a/debian/control b/debian/control
index bac15ff..ec8f510 100644
--- a/debian/control
+++ b/debian/control
@@ -153,6 +153,7 @@ Breaks: baloo-kf5 (<< 5.5),
         plasma-desktop-data (<< 4:5.3.2-0ubuntu1~),
         plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
         plasma-widget-kimpanel
+        kactivities (<< 5.18.0~)
 Replaces: baloo-kf5 (<< 5.5),
           kde-config-touchpad (<< 4:5),
           kde-touchpad (<< 5.1.95~),
@@ -161,6 +162,7 @@ Replaces: baloo-kf5 (<< 5.5),
           plasma-desktop-data (<< 4:5.3.2-0ubuntu1~),
           plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
           plasma-widget-kimpanel
+          kactivities (<< 5.18.0~)
 Conflicts: kde-workspace-bin
 Description: Tools and widgets for the desktop
  Plasma Desktop offers a beautiful looking desktop
@@ -230,6 +232,7 @@ Breaks: baloo-kf5 (<< 5.5),
         kde-workspace-data,
         plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
         ${kde-l10n:all}
+        kactivites (<< 5.18.0~)
 Replaces: baloo-kf5 (<< 5.5),
           kde-config-touchpad (<< 4:5),
           kde-touchpad (<< 5.1.95~),
@@ -237,6 +240,7 @@ Replaces: baloo-kf5 (<< 5.5),
           kde-workspace-data,
           plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
           ${kde-l10n:all}
+          kactivities (<< 5.18.0~)
 Description: Tools and widgets for the desktop data files
  Plasma Desktop offers a beautiful looking desktop
  that takes complete advantage of modern computing technology.

-- 
plasma-desktop packaging