[SCM] khotkeys packaging branch, master, updated. debian/5.5.4-1-10-ge202b49

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 3050d0d35b40f1bebb6f31896fb2a6eceaa6cc69
Merge: 308e588a6e7feb9d06620d321d3ab2d05a28210a 2f6c48d0fe3bc6b459b27c3ad22d8ebda72e8e9d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Apr 19 16:41:58 2016 +0200

    Merge remote-tracking branch 'local/master'

 debian/changelog | 14 ++++++++++++++
 debian/control   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 030eb96,224f859..b0d77e8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,23 @@@
+ khotkeys (4:5.6.2-1~2.gbpb66fd5) UNRELEASED; urgency=medium
+ 
+   ** SNAPSHOT build @b66fd5882fbe2c69475e3a730487da3cbd84b18a **
+ 
+   [ Maximiliano Curia ]
+   ** SNAPSHOT build @f18fc2232df8962478d8ffc1a460bd0618216ced **
+ 
+   * UNRELEASED
+ 
+   [ Automatic packaging ]
+   * Bump Standards-Version to 3.9.8
+ 
+  -- Automatic packaging <maxy+jenkins at gnuservers.com.ar>  Wed, 13 Apr 2016 09:25:34 +0200
+ 
 +khotkeys (4:5.5.5-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.5.5).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Mar 2016 17:29:28 +0100
 +
  khotkeys (4:5.5.4-1) experimental; urgency=medium
  
    * New upstream release (5.5.0).
diff --cc debian/control
index fea029e,01a70c7..0e8c112
--- a/debian/control
+++ b/debian/control
@@@ -21,10 -21,10 +21,10 @@@ Build-Depends: cmake (>= 2.8.12)
                 plasma-framework-dev (>= 5.2.0),
                 plasma-workspace-dev (>= 4:5.2.2),
                 qtbase5-dev (>= 5.4)
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.8
  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
 +Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/plasma/khotkeys.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-kde/plasma/khotkeys.git
  
  Package: khotkeys-dev
  Section: devel

-- 
khotkeys packaging