[SCM] khotkeys packaging branch, master, updated. 71e391e0c857a4710335da879f120bbeb5b9930b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 1327853e5bb3b226e0ae4965ea8d5f8beb3c70e5
Merge: 9a64ef0fbcb7e15a40d8a66312f507f9d1c21bf8 e5249d98617bc7124babff447015a3cff240aa75
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 2 07:55:40 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_stable'

 debian/changelog             | 20 ++++++++++++++++++++
 debian/khotkeys-data.install |  4 ++++
 debian/khotkeys-dev.install  |  1 +
 debian/khotkeys.install      |  1 +
 4 files changed, 26 insertions(+)

diff --cc debian/changelog
index 496f9b9,c530804..ee9d1ba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,30 +1,31 @@@
 +khotkeys (4:5.3.2-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.3.0).
 +  * New upstream release (5.3.1).
 +  * New upstream release (5.3.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:25:02 +0200
 +
+ khotkeys (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:26:28 +0200
+ 
+ khotkeys (4:5.3.1-0ubuntu1) wily; urgency=medium
+ 
+   [ Jonathan Riddell ]
+   * Plasma 5.3 beta
+   * new upstream release
+ 
+   [ Scarlett Clark ]
+   * Vivid backport
+   * Wrap-and-sort. 
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:29:16 +0200
 -khotkeys (4:5.3.1-1~) UNRELEASED; urgency=medium
 -
 -  * New upstream release (5.3.0).
 -  * New upstream release (5.3.1).
 -
 - -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:56:28 +0200
 -
  khotkeys (4:5.2.2-1) experimental; urgency=medium
  
    * New upstream release (5.2.1).

-- 
khotkeys packaging