[SCM] khotkeys packaging branch, kubuntu_unstable, updated. e5249d98617bc7124babff447015a3cff240aa75

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit e5249d98617bc7124babff447015a3cff240aa75
Merge: dd881fc17b88f40dd1591b78189987c4083536f7 66ee3c12350e6b45168ed95d9ad09acc5646b8af
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:13:17 2015 +0200

    merge master

 debian/.gitattributes           |  1 +
 debian/changelog                | 26 ++++++++++++++++++++++++++
 debian/control                  | 26 +++++++++++++++-----------
 debian/khotkeys-data.install    |  5 +++++
 debian/khotkeys-dev.install     |  1 +
 debian/khotkeys.install         |  2 ++
 debian/source/lintian-overrides |  1 -
 debian/watch                    |  5 ++---
 8 files changed, 52 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index 13cdf21,8240ef2..c530804
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,17 +1,37 @@@
 +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).
+   * New upstream release (5.2.2).
+   * Bump Standards-Version to 3.9.6.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:48 +0100
  
  khotkeys (4:5.2.2-0ubuntu1) vivid; urgency=medium
  
diff --cc debian/khotkeys-data.install
index 1f6d4ad,f80f87a..68581d2
--- a/debian/khotkeys-data.install
+++ b/debian/khotkeys-data.install
@@@ -1,4 -1,5 +1,9 @@@
 +usr/share/doc/
+ usr/share/doc/HTML/*/kcontrol/khotkeys/
+ usr/share/khotkeys/
 +usr/share/khotkeys/
 +usr/share/kservices5/
+ usr/share/kservices5/kded/khotkeys.desktop
+ usr/share/kservices5/khotkeys.desktop
 +usr/share/locale/
+ usr/share/locale/*/*/khotkeys.mo
diff --cc debian/khotkeys-dev.install
index 03e7773,25f55c6..5c612ff
--- a/debian/khotkeys-dev.install
+++ b/debian/khotkeys-dev.install
@@@ -1,2 -1,2 +1,3 @@@
  usr/lib/*/cmake/KHotKeysDBusInterface/KHotKeysDBusInterfaceConfig.cmake
 +usr/share/dbus-1/interfaces
+ usr/share/dbus-1/interfaces/org.kde.khotkeys.xml
diff --cc debian/khotkeys.install
index 9c7962e,4642cb7..bdaa91b
--- a/debian/khotkeys.install
+++ b/debian/khotkeys.install
@@@ -1,3 -1,4 +1,5 @@@
+ usr/lib/*/libkhotkeysprivate.so.5
 +usr/lib/*/libkhotkeysprivate.so.5*
+ usr/lib/*/libkhotkeysprivate.so.5.*
  usr/lib/*/qt5/plugins/kcm_hotkeys.so
  usr/lib/*/qt5/plugins/kded_khotkeys.so

-- 
khotkeys packaging