[SCM] frameworkintegration packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-11-gb861dd7
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Fri Jul 10 18:04:00 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/frameworkintegration.git;a=commitdiff;h=b861dd7
The following commit has been merged in the kubuntu_unstable branch:
commit b861dd7718ce8ca870a8b6fda141fa23623081f5
Merge: 7480735e28e07c49eed1fcc343882224bb19881c e73b62985c4904b4c43b1c359aea10eeedaa5089
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Fri Jul 10 11:03:13 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
Conflicts:
debian/changelog
debian/control
debian/changelog | 11 ++++++++++-
debian/control | 20 +++++++++++---------
2 files changed, 21 insertions(+), 10 deletions(-)
diff --cc debian/changelog
index a0d9885,e41a8c1..29e2abf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,17 +1,18 @@@
-frameworkintegration (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+frameworkintegration (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
- * Vivid backport
+ * New upstream release
++ * Fix merge, remove broken backport.
- -- Scarlett Clark <sgclark at kubuntu.org> Wed, 08 Jul 2015 08:02:16 -0700
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 07:53:54 -0700
- frameworkintegration (5.10.0-0ubuntu1) wily; urgency=medium
+ frameworkintegration (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 17:27:10 +0200
+
+ frameworkintegration (5.10.0-0ubuntu1) wily; urgency=medium
[ Maximiliano Curia ]
* New upstream release (5.10.0).
diff --cc debian/control
index 37426dd,c39d6fa..e920717
--- a/debian/control
+++ b/debian/control
@@@ -6,14 -6,14 +6,14 @@@ Uploaders: Maximiliano Curia <maxy at debi
Build-Depends: cmake (>= 2.8.12),
dbus-x11,
debhelper (>= 9),
- extra-cmake-modules (>= 5.10.0),
- kio-dev (>= 5.12.0),
- libkf5config-dev (>= 5.12.0),
- libkf5configwidgets-dev (>= 5.12.0),
- libkf5i18n-dev (>= 5.12.0),
- libkf5iconthemes-dev (>= 5.12.0),
- libkf5notifications-dev (>= 5.12.0),
- libkf5widgetsaddons-dev (>= 5.12.0),
- extra-cmake-modules (>= 5.11.0~),
- kio-dev (>= 5.11.0~),
- libkf5config-dev (>= 5.11.0~),
- libkf5configwidgets-dev (>= 5.11.0~),
- libkf5i18n-dev (>= 5.11.0~),
- libkf5iconthemes-dev (>= 5.11.0~),
- libkf5notifications-dev (>= 5.11.0~),
- libkf5widgetsaddons-dev (>= 5.11.0~),
++ extra-cmake-modules (>= 5.12.0~),
++ kio-dev (>= 5.12.0~),
++ libkf5config-dev (>= 5.12.0~),
++ libkf5configwidgets-dev (>= 5.12.0~),
++ libkf5i18n-dev (>= 5.12.0~),
++ libkf5iconthemes-dev (>= 5.12.0~),
++ libkf5notifications-dev (>= 5.12.0~),
++ libkf5widgetsaddons-dev (>= 5.12.0~),
libqt5widgets5,
libqt5x11extras5-dev (>= 5.4),
libxcursor-dev,
--
frameworkintegration packaging
More information about the pkg-kde-commits
mailing list