[SCM] kglobalaccel packaging branch, master, updated. debian/5.6.0-1-21-g8dd1756

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kglobalaccel.git;a=commitdiff;h=b37d0ca

The following commit has been merged in the master branch:
commit b37d0cab953f842cd22038ff7fdec83eabff0ff9
Merge: a289ddddbc8502dc17008f48f0c5457c0f6de39c 19afaa1b0652908f02a875ff39f078e4d4dbfa79
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 2 14:15:44 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control

 debian/changelog | 10 ++++++++++
 debian/control   | 21 ++++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 98f506f,2b9abe5..6fbb041
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,13 +1,32 @@@
 +kglobalaccel (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:36:59 +0100
 +
+ kglobalaccel (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+   * New package libkf5globalaccel-bin housing the helper daemon
+   * libkf5globalaccel-bin Breaks and Replaces older versions of
+     plasma-workspace which previously contained the helper. same goes for
+     -data which contains the dbus service file
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:34:33 +0100
+ 
 +kglobalaccel (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update install files.
 +  * Update watch file.
 +  * Add basic autopkgtests support.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 27 Jan 2015 10:31:36 +0100
 +
  kglobalaccel (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index c7c6898,37370ff..d517995
--- a/debian/control
+++ b/debian/control
@@@ -3,9 -3,15 +3,9 @@@ Section: lib
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
+                extra-cmake-modules (>= 1.7.0),
 -               libkf5config-dev (>= 5.6.0),
 -               libkf5coreaddons-dev (>= 5.6.0),
 -               libkf5crash-dev (>= 5.6.0),
 -               libkf5dbusaddons-dev (>= 5.6.0),
 -               libkf5i18n-dev (>= 5.6.0),
 -               libkf5windowsystem-dev (>= 5.6.0),
                 libqt5x11extras5-dev,
                 libxcb-keysyms1-dev,
                 pkg-config,

-- 
kglobalaccel packaging