[SCM] khotkeys packaging branch, master, updated. cd3fe0c03bf103ad1dba826096dae9d2dff93c84

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7fa7067b3fca0cde6ac58fe4e4a70714d9821b59
Merge: ebc9145e2b44587e016d140ec6dca92c5411ba81 1aa140d36a7e2b8dbb359f9b06be34236b0b8bbf
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 10:43:22 2015 +0100

    Merge commit '1aa140d36a7e2b8dbb359f9b06be34236b0b8bbf'
    
    Conflicts:
    	debian/control

 debian/changelog              | 12 ++++++++++++
 debian/control                |  4 ++--
 debian/meta/upstream_scm.json |  1 -
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 349f147,f3eb09c..0396069
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +khotkeys (4:5.2.2-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.2.1).
 +  * New upstream release (5.2.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 09:58:10 +0100
 +
+ khotkeys (4:5.2.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:16:27 -0700
+ 
+ khotkeys (4:5.2.1-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:39:00 -0800
+ 
 +khotkeys (4:5.2.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Add myself as Uploader.
 +  * 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.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 12 Feb 2015 21:31:36 +0100
 +
  khotkeys (4:5.2.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 4822dc2,cac3ac6..07fefd8
--- a/debian/control
+++ b/debian/control
@@@ -1,30 -1,25 +1,30 @@@
  Source: khotkeys
 -Priority: extra
 +Section: kde
 +Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 -Build-Depends: cmake,
 +Uploaders: Maximiliano Curia <maxy at debian.org>
 +Build-Depends: cmake (>= 2.8.12),
                 dbus-x11,
 -               debhelper (>= 9.0.0),
 +               debhelper (>= 9),
                 extra-cmake-modules (>= 1.3.0~),
 -               qtbase5-dev,
 -               libkf5globalaccel-dev (>= 5.2.0),
 -               libkf5i18n-dev (>= 5.2.0),
 +               kinit-dev,
                 kio-dev (>= 5.2.0),
 -               libkf5xmlgui-dev (>= 5.2.0),
 -               libkf5kdelibs4support-dev (>= 5.2.0),
                 libkf5dbusaddons-dev (>= 5.2.0),
 +               libkf5globalaccel-dev (>= 5.2.0),
 +               libkf5i18n-dev (>= 5.2.0),
                 libkf5kcmutils-dev (>= 5.2.0),
 -               libqt5x11extras5-dev,
 +               libkf5kdelibs4support-dev (>= 5.2.0),
 +               libkf5xmlgui-dev (>= 5.2.0),
 +               libqt5x11extras5-dev (>= 5.3.0~),
 +               libx11-dev,
 +               pkg-kde-tools (>= 0.15.16),
                 plasma-framework-dev (>= 5.2.0),
-                plasma-workspace-dev (>= 4:5.2.0),
+                plasma-workspace-dev (>= 4:5.2.2),
 -               pkg-kde-tools
 +               qtbase5-dev (>= 5.3.0)
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.5
 -Section: kde
  Homepage: https://projects.kde.org/projects/kde/workspace/khotkeys
 +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/khotkeys.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/khotkeys.git
  
  Package: khotkeys-dev
  Section: devel

-- 
khotkeys packaging