[SCM] plasma-framework packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-2-gd5e39ee
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Sat Jul 11 14:35:21 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=d5e39ee
The following commit has been merged in the kubuntu_wily_archive branch:
commit d5e39ee09134b2b8e061d41624fec1c567e11e79
Merge: 571d709b7026664c84f89605f2f3f26086410c13 654d5399cc11bfeaea014ef4ddf3113630a1be07
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Sat Jul 11 07:35:13 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
Conflicts:
debian/changelog
debian/control
debian/changelog | 8 ++++++
debian/control | 58 +++++++++++++++++++--------------------
debian/libkf5plasma5.symbols | 4 ++-
debian/libkf5plasmaquick5.symbols | 14 +++++-----
debian/tests/control | 2 +-
5 files changed, 48 insertions(+), 38 deletions(-)
diff --cc debian/changelog
index ddde6f7,1f6ee0a..7354023
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
+plasma-framework (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release
++ * Fix merge.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 08:31:14 -0700
+
+ plasma-framework (5.11.0-1) unstable; urgency=medium
+
+ * New upstream release (5.11.0).
+ * Update symbols files.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 29 Jun 2015 17:27:27 +0200
+
plasma-framework (5.10.0-0ubuntu1) wily; urgency=medium
[ Maximiliano Curia ]
diff --cc debian/control
index 54a5f9e,f73028d..86f5e49
--- a/debian/control
+++ b/debian/control
@@@ -5,33 -5,33 +5,33 @@@ 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),
- kdoctools-dev (>= 5.12.0),
- kio-dev (>= 5.12.0),
- libkf5activities-dev (>= 5.12.0),
- libkf5archive-dev (>= 5.12.0),
- libkf5codecs-dev (>= 5.12.0),
- libkf5config-dev (>= 5.12.0),
- libkf5configwidgets-dev (>= 5.12.0),
- libkf5coreaddons-dev (>= 5.12.0),
- libkf5dbusaddons-dev (>= 5.12.0),
- libkf5declarative-dev (>= 5.12.0),
- libkf5globalaccel-dev (>= 5.12.0),
- libkf5guiaddons-dev (>= 5.12.0),
- libkf5i18n-dev (>= 5.12.0),
- libkf5iconthemes-dev (>= 5.12.0),
- libkf5idletime-dev (>= 5.12.0),
- libkf5itemmodels-dev (>= 5.12.0),
- libkf5notifications-dev (>= 5.12.0),
- libkf5package-dev (>= 5.12.0),
- libkf5parts-dev (>= 5.12.0),
- libkf5service-dev (>= 5.12.0),
- libkf5solid-dev (>= 5.12.0),
- libkf5su-dev (>= 5.12.0),
- libkf5threadweaver-dev (>= 5.12.0),
- libkf5widgetsaddons-dev (>= 5.12.0),
- libkf5windowsystem-dev (>= 5.12.0),
- libkf5xmlgui-dev (>= 5.12.0),
- extra-cmake-modules (>= 5.11.0~),
- kdoctools-dev (>= 5.11.0~),
- kio-dev (>= 5.11.0~),
- libkf5activities-dev (>= 5.11.0~),
- libkf5archive-dev (>= 5.11.0~),
- libkf5codecs-dev (>= 5.7.0),
- libkf5config-dev (>= 5.11.0~),
- libkf5configwidgets-dev (>= 5.11.0~),
- libkf5coreaddons-dev (>= 5.11.0~),
- libkf5dbusaddons-dev (>= 5.11.0~),
- libkf5declarative-dev (>= 5.11.0~),
- libkf5globalaccel-dev (>= 5.11.0~),
- libkf5guiaddons-dev (>= 5.11.0~),
- libkf5i18n-dev (>= 5.11.0~),
- libkf5iconthemes-dev (>= 5.11.0~),
- libkf5idletime-dev (>= 5.7.0),
- libkf5itemmodels-dev (>= 5.7.0),
- libkf5notifications-dev (>= 5.11.0~),
- libkf5package-dev (>= 5.11.0~),
- libkf5parts-dev (>= 5.11.0~),
- libkf5service-dev (>= 5.11.0~),
- libkf5solid-dev (>= 5.7.0),
- libkf5su-dev (>= 5.7.0),
- libkf5threadweaver-dev (>= 5.7.0),
- libkf5widgetsaddons-dev (>= 5.11.0~),
- libkf5windowsystem-dev (>= 5.11.0~),
- libkf5xmlgui-dev (>= 5.11.0~),
++ extra-cmake-modules (>= 5.12.0~),
++ kdoctools-dev (>= 5.12.0~),
++ kio-dev (>= 5.12.0~),
++ libkf5activities-dev (>= 5.12.0~),
++ libkf5archive-dev (>= 5.12.0~),
++ libkf5codecs-dev (>= 5.12.0~),
++ libkf5config-dev (>= 5.12.0~),
++ libkf5configwidgets-dev (>= 5.12.0~),
++ libkf5coreaddons-dev (>= 5.12.0~),
++ libkf5dbusaddons-dev (>= 5.12.0~),
++ libkf5declarative-dev (>= 5.12.0~),
++ libkf5globalaccel-dev (>= 5.12.0~),
++ libkf5guiaddons-dev (>= 5.12.0~),
++ libkf5i18n-dev (>= 5.12.0~),
++ libkf5iconthemes-dev (>= 5.12.0~),
++ libkf5idletime-dev (>= 5.12.0~),
++ libkf5itemmodels-dev (>= 5.12.0~),
++ libkf5notifications-dev (>= 5.12.0~),
++ libkf5package-dev (>= 5.12.0~),
++ libkf5parts-dev (>= 5.12.0~),
++ libkf5service-dev (>= 5.12.0~),
++ libkf5solid-dev (>= 5.12.0~),
++ libkf5su-dev (>= 5.12.0~),
++ libkf5threadweaver-dev (>= 5.12.0~),
++ libkf5widgetsaddons-dev (>= 5.12.0~),
++ libkf5windowsystem-dev (>= 5.12.0~),
++ libkf5xmlgui-dev (>= 5.12.0~),
libqt5svg5-dev (>= 5.4),
libqt5x11extras5-dev (>= 5.4),
libsm-dev,
@@@ -55,10 -55,10 +55,10 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
Package: plasma-framework-dev
Architecture: any
Section: libdevel
- Depends: libkf5package-dev (>= 5.12.0),
-Depends: libkf5package-dev (>= 5.11.0~),
++Depends: libkf5package-dev (>= 5.12.0~),
libkf5plasma5 (= ${binary:Version}),
libkf5plasmaquick5 (= ${binary:Version}),
- libkf5service-dev (>= 5.12.0),
- libkf5service-dev (>= 5.11.0~),
++ libkf5service-dev (>= 5.12.0~),
${misc:Depends}
Replaces: plasma-framework (<= 5.9.0+git20150516.1328+15.04-0)
Breaks: plasma-framework (<= 5.9.0+git20150516.1328+15.04-0)
--
plasma-framework packaging
More information about the pkg-kde-commits
mailing list