[SCM] plasma-desktop packaging branch, kubuntu_vivid_archive, updated. 2994ad3f60bfe40a9e57e4a1444d4580ee16c847

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 2994ad3f60bfe40a9e57e4a1444d4580ee16c847
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jan 19 18:16:49 2015 +0100

    Add break/replaces on old baloo-kf5 for moved files
---
 debian/changelog | 6 ++++++
 debian/control   | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 31517dd..180ae74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plasma-desktop (4:5.1.95-0ubuntu4) vivid; urgency=medium
+
+  * Add break/replaces on old baloo-kf5 for moved files
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 19 Jan 2015 18:16:31 +0100
+
 plasma-desktop (4:5.1.95-0ubuntu3) vivid; urgency=medium
 
   * remove recommends on kwin-decoration-oxygen, it no longer exists
diff --git a/debian/control b/debian/control
index 7577e18..1c205d3 100644
--- a/debian/control
+++ b/debian/control
@@ -95,8 +95,8 @@ Recommends: kde-style-oxygen-qt5,
             sni-qt,
             systemsettings,
             ttf-oxygen-font-family
-Breaks: plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
-Replaces: plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
+Breaks: plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8), baloo-kf5 (<< 5.5)
+Replaces: plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8), baloo-kf5 (<< 5.5)
 Conflicts: kde-workspace-bin
 Description: Tools and widgets for the desktop
  Plasma Desktop offers a beautiful looking desktop
@@ -141,8 +141,8 @@ Package: plasma-desktop-data
 Architecture: all
 Depends: ${misc:Depends}
 Conflicts: kde-workspace-bin, kde-workspace-data
-Breaks: plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
-Replaces: plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
+Breaks: plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8), baloo-kf5 (<< 5.5)
+Replaces: plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8), baloo-kf5 (<< 5.5)
 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