[SCM] plasma-workspace packaging branch, kubuntu_vivid_archive, updated. 300b89e7ac1495686e9d51d7ec66a4fd06e04215

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 300b89e7ac1495686e9d51d7ec66a4fd06e04215
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Feb 10 09:47:14 2015 +0100

    Merge kubuntu_stable branch to adopt kglobalacceld move for frameworks 5.7
    
    * Merge kubuntu_stable branch to adopt kglobalacceld move for
      frameworks 5.7
      + Force a dependency on the kglobalaccel binary package >= 5.7
---
 debian/changelog | 8 ++++++++
 debian/control   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ae8a74b..301e570 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+plasma-workspace (4:5.2.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Merge kubuntu_stable branch to adopt kglobalacceld move for
+    frameworks 5.7
+    + Force a dependency on the kglobalaccel binary package >= 5.7
+
+ -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 09:45:34 +0100
+
 plasma-workspace (4:5.2.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index ade63f1..32a408e 100644
--- a/debian/control
+++ b/debian/control
@@ -146,7 +146,7 @@ Depends: dbus-x11,
          kded5,
          kinit,
          kio-extras,
-         libkf5globalaccel-bin,
+         libkf5globalaccel-bin (>= 5.7.0),
          libkf5service-bin,
          milou,
          plasma-framework,

-- 
plasma-workspace packaging