[SCM] kio packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-17-g6992b04
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Fri Jul 10 22:58:14 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=6992b04
The following commit has been merged in the kubuntu_unstable branch:
commit 6992b04e459a15ac5105d5bc66f38f499051bdc6
Merge: a46f4b93af72058f275d272d9ffa8cb5d16b1366 58e40b6c66845b06ea749aacac9550c2184c084e
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Fri Jul 10 15:57:30 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
Conflicts:
debian/changelog
debian/control
debian/changelog | 9 +++++
debian/control | 58 +++++++++++++--------------
debian/not-installed | 11 ++---
debian/patches/kubuntu_build-with-kf5.10.diff | 32 ---------------
debian/patches/series | 1 -
5 files changed, 41 insertions(+), 70 deletions(-)
diff --cc debian/changelog
index 1eeb576,66f5cbb..04f34e9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,18 @@@
-kio (5.11.0-1ubuntu1) UNRELEASED; urgency=medium
+kio (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
- * Vivid backport.
+ * New upstream release
++ * Fix merge, remove unused broken backport.
- -- Scarlett Clark <sgclark at kubuntu.org> Wed, 08 Jul 2015 11:35:20 -0700
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 08:13:45 -0700
+ kio (5.11.0-1) unstable; urgency=medium
+
+ * New upstream release (5.10.0).
+ * Update symbols files.
+ * New upstream release (5.11.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 29 Jun 2015 09:42:03 +0200
+
kio (5.11.0-0ubuntu2) wily; urgency=medium
* Remove ktcpsockettest in kubuntu_failing-tests.diff to fix build
diff --cc debian/control
index 1e1e603,6b36cf0..dedbef8
--- a/debian/control
+++ b/debian/control
@@@ -5,29 -5,29 +5,29 @@@ 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),
- extra-cmake-modules (>= 5.11.0~),
- kdoctools-dev (>= 5.11.0~),
++ extra-cmake-modules (>= 5.12.0~),
++ kdoctools-dev (>= 5.12.0~),
libacl1-dev,
- libkf5archive-dev (>= 5.12.0),
- libkf5bookmarks-dev (>= 5.12.0),
- libkf5codecs-dev (>= 5.12.0),
- libkf5completion-dev (>= 5.12.0),
- libkf5config-dev (>= 5.12.0),
- libkf5configwidgets-dev (>= 5.12.0),
- libkf5coreaddons-dev (>= 5.12.0),
- libkf5dbusaddons-dev (>= 5.12.0),
- libkf5i18n-dev (>= 5.12.0),
- libkf5iconthemes-dev (>= 5.12.0),
- libkf5itemviews-dev (>= 5.12.0),
- libkf5jobwidgets-dev (>= 5.12.0),
- libkf5notifications-dev (>= 5.12.0),
- libkf5service-dev (>= 5.12.0),
- libkf5solid-dev (>= 5.12.0),
- libkf5textwidgets-dev (>= 5.12.0),
- libkf5wallet-dev (>= 5.12.0),
- libkf5widgetsaddons-dev (>= 5.12.0),
- libkf5windowsystem-dev (>= 5.12.0),
- libkf5xmlgui-dev (>= 5.12.0),
- libkf5archive-dev (>= 5.11.0~),
- libkf5bookmarks-dev (>= 5.11.0~),
- libkf5codecs-dev (>= 5.10.0),
- libkf5completion-dev (>= 5.11.0~),
- libkf5config-dev (>= 5.11.0~),
- libkf5configwidgets-dev (>= 5.11.0~),
- libkf5coreaddons-dev (>= 5.11.0~),
- libkf5dbusaddons-dev (>= 5.11.0~),
- libkf5i18n-dev (>= 5.11.0~),
- libkf5iconthemes-dev (>= 5.11.0~),
- libkf5itemviews-dev (>= 5.11.0~),
- libkf5jobwidgets-dev (>= 5.11.0~),
- libkf5notifications-dev (>= 5.11.0~),
- libkf5service-dev (>= 5.11.0~),
- libkf5solid-dev (>= 5.11.0~),
- libkf5textwidgets-dev (>= 5.11.0~),
- libkf5wallet-dev (>= 5.11.0~),
- libkf5widgetsaddons-dev (>= 5.11.0~),
- libkf5windowsystem-dev (>= 5.11.0~),
- libkf5xmlgui-dev (>= 5.11.0~),
++ libkf5archive-dev (>= 5.12.0~),
++ libkf5bookmarks-dev (>= 5.12.0~),
++ libkf5codecs-dev (>= 5.12.0~),
++ libkf5completion-dev (>= 5.12.0~),
++ libkf5config-dev (>= 5.12.0~),
++ libkf5configwidgets-dev (>= 5.12.0~),
++ libkf5coreaddons-dev (>= 5.12.0~),
++ libkf5dbusaddons-dev (>= 5.12.0~),
++ libkf5i18n-dev (>= 5.12.0~),
++ libkf5iconthemes-dev (>= 5.12.0~),
++ libkf5itemviews-dev (>= 5.12.0~),
++ libkf5jobwidgets-dev (>= 5.12.0~),
++ libkf5notifications-dev (>= 5.12.0~),
++ libkf5service-dev (>= 5.12.0~),
++ libkf5solid-dev (>= 5.12.0~),
++ libkf5textwidgets-dev (>= 5.12.0~),
++ libkf5wallet-dev (>= 5.12.0~),
++ libkf5widgetsaddons-dev (>= 5.12.0~),
++ libkf5windowsystem-dev (>= 5.12.0~),
++ libkf5xmlgui-dev (>= 5.12.0~),
libkrb5-dev,
libqt5x11extras5-dev (>= 5.4),
libxml2-dev,
@@@ -46,17 -46,17 +46,17 @@@ Package: kio-de
Section: libdevel
Architecture: any
Depends: kio (= ${binary:Version}),
- libkf5bookmarks-dev (>= 5.12.0),
- libkf5completion-dev (>= 5.12.0),
- libkf5itemviews-dev (>= 5.12.0),
- libkf5jobwidgets-dev (>= 5.12.0),
- libkf5bookmarks-dev (>= 5.11.0~),
- libkf5completion-dev (>= 5.11.0~),
- libkf5itemviews-dev (>= 5.11.0~),
- libkf5jobwidgets-dev (>= 5.11.0~),
++ libkf5bookmarks-dev (>= 5.12.0~),
++ libkf5completion-dev (>= 5.12.0~),
++ libkf5itemviews-dev (>= 5.12.0~),
++ libkf5jobwidgets-dev (>= 5.12.0~),
libkf5kiocore5 (= ${binary:Version}),
libkf5kiofilewidgets5 (= ${binary:Version}),
libkf5kiontlm5 (= ${binary:Version}),
libkf5kiowidgets5 (= ${binary:Version}),
- libkf5service-dev (>= 5.12.0),
- libkf5solid-dev (>= 5.12.0),
- libkf5xmlgui-dev (>= 5.12.0),
- libkf5service-dev (>= 5.11.0~),
- libkf5solid-dev (>= 5.11.0~),
- libkf5xmlgui-dev (>= 5.11.0~),
++ libkf5service-dev (>= 5.12.0~),
++ libkf5solid-dev (>= 5.12.0~),
++ libkf5xmlgui-dev (>= 5.12.0~),
qtbase5-dev (>= 5.4),
${misc:Depends}
Description: Resource and network access abstraction.
--
kio packaging
More information about the pkg-kde-commits
mailing list