[SCM] khotkeys packaging branch, kubuntu_unstable, updated. 9c31c14497d9e469491ba762ce98c90fe0ada7d3
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Thu May 28 01:35:19 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/khotkeys.git;a=commitdiff;h=9c31c14
The following commit has been merged in the kubuntu_unstable branch:
commit 9c31c14497d9e469491ba762ce98c90fe0ada7d3
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Wed May 27 17:47:14 2015 -0700
Vivid backport
* Vivid backport
* Wrap-and-sort.
---
debian/changelog | 9 +++++++--
debian/control | 14 +++++++-------
debian/khotkeys-data.install | 2 +-
debian/khotkeys-dev.install | 2 +-
debian/khotkeys.install | 2 +-
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a66eac4..99192e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-khotkeys (4:5.3.0-0ubuntu1) UNRELEASED; urgency=medium
+khotkeys (4:5.3.1-0ubuntu1) UNRELEASED; urgency=medium
+ [ Jonathan Riddell ]
* Plasma 5.3 beta
* new upstream release
- -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 23 Apr 2015 16:59:19 +0200
+ [ Scarlett Clark ]
+ * Vivid backport
+ * Wrap-and-sort.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Wed, 27 May 2015 07:36:58 -0700
khotkeys (4:5.2.2-0ubuntu1) vivid; urgency=medium
diff --git a/debian/control b/debian/control
index 4db34a7..c487e4f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,18 @@ Build-Depends: cmake,
dbus-x11,
debhelper (>= 9.0.0),
extra-cmake-modules (>= 1.3.0~),
- qtbase5-dev,
- libkf5globalaccel-dev (>= 5.2.0),
- libkf5i18n-dev (>= 5.2.0),
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),
+ libkf5kdelibs4support-dev (>= 5.2.0),
+ libkf5xmlgui-dev (>= 5.2.0),
libqt5x11extras5-dev,
+ pkg-kde-tools,
plasma-framework-dev (>= 5.2.0),
- plasma-workspace-dev (>= 4:5.3.0),
- pkg-kde-tools
+ plasma-workspace-dev (>= 4:5.3.1),
+ qtbase5-dev
Standards-Version: 3.9.5
Section: kde
Homepage: https://projects.kde.org/projects/kde/workspace/khotkeys
diff --git a/debian/khotkeys-data.install b/debian/khotkeys-data.install
index 4369498..1f6d4ad 100644
--- a/debian/khotkeys-data.install
+++ b/debian/khotkeys-data.install
@@ -1,4 +1,4 @@
-usr/share/locale/
usr/share/doc/
usr/share/khotkeys/
usr/share/kservices5/
+usr/share/locale/
diff --git a/debian/khotkeys-dev.install b/debian/khotkeys-dev.install
index 2c5ceaa..03e7773 100644
--- a/debian/khotkeys-dev.install
+++ b/debian/khotkeys-dev.install
@@ -1,2 +1,2 @@
-usr/share/dbus-1/interfaces
usr/lib/*/cmake/KHotKeysDBusInterface/KHotKeysDBusInterfaceConfig.cmake
+usr/share/dbus-1/interfaces
diff --git a/debian/khotkeys.install b/debian/khotkeys.install
index f625664..9c7962e 100644
--- a/debian/khotkeys.install
+++ b/debian/khotkeys.install
@@ -1,3 +1,3 @@
usr/lib/*/libkhotkeysprivate.so.5*
-usr/lib/*/qt5/plugins/kded_khotkeys.so
usr/lib/*/qt5/plugins/kcm_hotkeys.so
+usr/lib/*/qt5/plugins/kded_khotkeys.so
--
khotkeys packaging
More information about the pkg-kde-commits
mailing list