[SCM] kdelibs4support packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-17-gbfcd5f5
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Fri Jul 10 19:46:36 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdelibs4support.git;a=commitdiff;h=bfcd5f5
The following commit has been merged in the kubuntu_unstable branch:
commit bfcd5f510c7e747effa338a25861ec0fac7c8aee
Merge: 3aa7c3ff9b335a907c37bfc63ce7c10f4b9ff3bf 352beaa496ce437bb0974b5ed3ee6eff3deece28
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Fri Jul 10 12:45:54 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
Conflicts:
debian/changelog
debian/control
debian/changelog | 15 +++++--
debian/control | 68 ++++++++++++++++---------------
debian/libkf5kdelibs4support-data.install | 4 +-
debian/libkf5kdelibs4support5.symbols | 29 ++++++-------
4 files changed, 64 insertions(+), 52 deletions(-)
diff --cc debian/changelog
index 6c510c8,4deedf5..c480826
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,17 @@@
-kdelibs4support (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+kdelibs4support (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 08:13:01 -0700
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 08:04:06 -0700
+ kdelibs4support (5.11.0-1) unstable; urgency=medium
+
+ * New upstream release (5.10.0).
+ * New upstream release (5.11.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 29 Jun 2015 15:51:33 +0200
+
kdelibs4support (5.10.0-0ubuntu1) wily; urgency=medium
* New upstream release
diff --cc debian/control
index bbdd378,535e261..4172086
--- a/debian/control
+++ b/debian/control
@@@ -5,30 -5,30 +5,30 @@@ 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),
- kdesignerplugin (>= 5.10.0~),
- kdoctools-dev (>= 5.12.0),
- kgendesignerplugin (>= 5.12.0),
- kio-dev (>= 5.12.0),
- extra-cmake-modules (>= 5.11.0~),
- kdesignerplugin (>= 5.11.0~),
- kdoctools-dev (>= 5.11.0~),
- kgendesignerplugin (>= 5.10.0),
- kio-dev (>= 5.11.0~),
++ extra-cmake-modules (>= 5.12.0~),
++ kdesignerplugin (>= 5.12.0~),
++ kdoctools-dev (>= 5.12.0~),
++ kgendesignerplugin (>= 5.12.0~),
++ kio-dev (>= 5.12.0~),
libecm-dev,
libintl-perl,
- libkf5completion-dev (>= 5.12.0),
- libkf5config-dev (>= 5.12.0),
- libkf5configwidgets-dev (>= 5.12.0),
- libkf5crash-dev (>= 5.12.0),
- libkf5dbusaddons-dev (>= 5.12.0),
- libkf5globalaccel-dev (>= 5.12.0),
- libkf5guiaddons-dev (>= 5.12.0),
- libkf5i18n-dev (>= 5.12.0),
- libkf5iconthemes-dev (>= 5.12.0),
- libkf5notifications-dev (>= 5.12.0),
- libkf5parts-dev (>= 5.12.0),
- libkf5service-dev (>= 5.12.0),
- libkf5textwidgets-dev (>= 5.12.0),
- libkf5unitconversion-dev (>= 5.12.0),
- libkf5widgetsaddons-dev (>= 5.12.0),
- libkf5windowsystem-dev (>= 5.12.0),
- libkf5xmlgui-dev (>= 5.12.0),
- libkf5completion-dev (>= 5.11.0~),
- libkf5config-dev (>= 5.11.0~),
- libkf5configwidgets-dev (>= 5.11.0~),
- libkf5crash-dev (>= 5.11.0~),
- libkf5dbusaddons-dev (>= 5.11.0~),
- libkf5globalaccel-dev (>= 5.11.0~),
- libkf5guiaddons-dev (>= 5.11.0~),
- libkf5i18n-dev (>= 5.11.0~),
- libkf5iconthemes-dev (>= 5.11.0~),
- libkf5notifications-dev (>= 5.11.0~),
- libkf5parts-dev (>= 5.11.0~),
- libkf5service-dev (>= 5.11.0~),
- libkf5textwidgets-dev (>= 5.11.0~),
- libkf5unitconversion-dev (>= 5.11.0~),
- libkf5widgetsaddons-dev (>= 5.11.0~),
- libkf5windowsystem-dev (>= 5.11.0~),
- libkf5xmlgui-dev (>= 5.11.0~),
++ libkf5completion-dev (>= 5.12.0~),
++ libkf5config-dev (>= 5.12.0~),
++ libkf5configwidgets-dev (>= 5.12.0~),
++ libkf5crash-dev (>= 5.12.0~),
++ libkf5dbusaddons-dev (>= 5.12.0~),
++ libkf5globalaccel-dev (>= 5.12.0~),
++ libkf5guiaddons-dev (>= 5.12.0~),
++ libkf5i18n-dev (>= 5.12.0~),
++ libkf5iconthemes-dev (>= 5.12.0~),
++ libkf5notifications-dev (>= 5.12.0~),
++ libkf5parts-dev (>= 5.12.0~),
++ libkf5service-dev (>= 5.12.0~),
++ libkf5textwidgets-dev (>= 5.12.0~),
++ libkf5unitconversion-dev (>= 5.12.0~),
++ libkf5widgetsaddons-dev (>= 5.12.0~),
++ libkf5windowsystem-dev (>= 5.12.0~),
++ libkf5xmlgui-dev (>= 5.12.0~),
libqt5concurrent5,
libqt5dbus5,
libqt5gui5,
@@@ -57,16 -57,17 +57,17 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
Package: libkf5kdelibs4support-dev
Section: libdevel
Architecture: any
- Depends: kdoctools-dev (>= 5.12.0),
- kgendesignerplugin (>= 5.12.0),
+ Multi-Arch: foreign
-Depends: kdoctools-dev (>= 5.11.0~),
- kgendesignerplugin (>= 5.10.0),
++Depends: kdoctools-dev (>= 5.12.0~),
++ kgendesignerplugin (>= 5.12.0~),
kinit-dev,
kross-dev,
- libkf5configwidgets-dev (>= 5.12.0),
- libkf5crash-dev (>= 5.12.0),
- libkf5configwidgets-dev (>= 5.11.0~),
- libkf5crash-dev (>= 5.11.0~),
++ libkf5configwidgets-dev (>= 5.12.0~),
++ libkf5crash-dev (>= 5.12.0~),
libkf5dnssd-dev,
libkf5emoticons-dev,
- libkf5guiaddons-dev (>= 5.12.0),
- libkf5iconthemes-dev (>= 5.12.0),
- libkf5guiaddons-dev (>= 5.11.0~),
- libkf5iconthemes-dev (>= 5.11.0~),
++ libkf5guiaddons-dev (>= 5.12.0~),
++ libkf5iconthemes-dev (>= 5.12.0~),
libkf5idletime-dev,
libkf5itemmodels-dev,
libkf5kcmutils-dev,
@@@ -75,18 -76,18 +76,18 @@@
libkf5khtml-dev,
libkf5mediaplayer-dev,
libkf5newstuff-dev,
- libkf5notifications-dev (>= 5.12.0),
- libkf5notifications-dev (>= 5.11.0~),
++ libkf5notifications-dev (>= 5.12.0~),
libkf5notifyconfig-dev,
- libkf5parts-dev (>= 5.12.0),
- libkf5parts-dev (>= 5.11.0~),
++ libkf5parts-dev (>= 5.12.0~),
libkf5plotting-dev,
libkf5style-dev,
libkf5su-dev,
- libkf5textwidgets-dev (>= 5.12.0),
- libkf5textwidgets-dev (>= 5.11.0~),
++ libkf5textwidgets-dev (>= 5.12.0~),
libkf5threadweaver-dev,
- libkf5unitconversion-dev (>= 5.12.0),
- libkf5unitconversion-dev (>= 5.11.0~),
++ libkf5unitconversion-dev (>= 5.12.0~),
libkf5wallet-dev,
libkf5webkit-dev,
- libkf5windowsystem-dev (>= 5.12.0),
- libkf5windowsystem-dev (>= 5.11.0~),
++ libkf5windowsystem-dev (>= 5.12.0~),
libssl-dev,
qtbase5-dev (>= 5.4),
${misc:Depends}
--
kdelibs4support packaging
More information about the pkg-kde-commits
mailing list