[SCM] kglobalaccel packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-5-g3912085
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Fri Jul 10 21:38:38 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kglobalaccel.git;a=commitdiff;h=3912085
The following commit has been merged in the kubuntu_wily_archive branch:
commit 391208526bfc3c2316f475c90a4f6370b554ef0a
Merge: 9271ff44c358f093547c0310a469c23f02c7523c a410f1ece1896673698a04d0c14ab287f6fc27e6
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Fri Jul 10 14:38:29 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
Conflicts:
debian/changelog
debian/control
debian/changelog | 28 ++++++++++++-----
debian/control | 28 ++++++++++++-----
debian/libkf5globalaccelprivate5.install | 2 ++
debian/libkf5globalaccelprivate5.symbols | 53 ++++++++++++++++++++++++++++++++
4 files changed, 97 insertions(+), 14 deletions(-)
diff --cc debian/changelog
index 25af940,3863123..52f27ce
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,26 +1,27 @@@
-kglobalaccel (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+kglobalaccel (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
- [ Jonathan Riddell ]
- * Build-dep on libxcb-xtest0-dev
-
+ [ Scarlett Clark ]
+ * New upstream release
++ * Fix merge, remove unused broken backport.
++
+ [ Jonathan Riddell ]
+ * Build-dep on libxcb-xtest0-dev
- [ Scarlett Clark ]
- * Vivid backport
-
- -- Scarlett Clark <sgclark at kubuntu.org> Wed, 08 Jul 2015 08:17:24 -0700
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 08:08:17 -0700
+ kglobalaccel (5.11.0-1) unstable; urgency=medium
+
+ * New upstream release (5.10.0).
+ * Update symbols files.
+ * New upstream release (5.11.0).
+
+ [ Jonathan Riddell ]
+ * Build-dep on libxcb-xtest0-dev.
+
+ [ Maximiliano Curia ]
+
+ -- Maximiliano Curia <maxy at debian.org> Sun, 28 Jun 2015 14:29:56 +0200
+
kglobalaccel (5.10.0-0ubuntu1) wily; urgency=medium
[ Maximiliano Curia ]
diff --cc debian/control
index 649891f,7b85d60..04ca23b
--- a/debian/control
+++ b/debian/control
@@@ -5,13 -5,13 +5,13 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.12),
debhelper (>= 9),
- extra-cmake-modules (>= 5.10.0),
- libkf5config-dev (>= 5.12.0),
- libkf5coreaddons-dev (>= 5.12.0),
- libkf5crash-dev (>= 5.12.0),
- libkf5dbusaddons-dev (>= 5.12.0),
- libkf5i18n-dev (>= 5.12.0),
- libkf5windowsystem-dev (>= 5.12.0),
- extra-cmake-modules (>= 5.11.0~),
- libkf5config-dev (>= 5.11.0~),
- libkf5coreaddons-dev (>= 5.11.0~),
- libkf5crash-dev (>= 5.11.0~),
- libkf5dbusaddons-dev (>= 5.11.0~),
- libkf5i18n-dev (>= 5.10.0~),
- libkf5windowsystem-dev (>= 5.11.0~),
++ extra-cmake-modules (>= 5.10.0~),
++ libkf5config-dev (>= 5.12.0~),
++ libkf5coreaddons-dev (>= 5.12.0~),
++ libkf5crash-dev (>= 5.12.0~),
++ libkf5dbusaddons-dev (>= 5.12.0~),
++ libkf5i18n-dev (>= 5.12.0~),
++ libkf5windowsystem-dev (>= 5.12.0~),
libqt5x11extras5-dev (>= 5.4),
libx11-dev,
libxcb-keysyms1-dev,
--
kglobalaccel packaging
More information about the pkg-kde-commits
mailing list