[SCM] kparts packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-3-g0a676a4
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Thu Jul 2 05:53:09 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kparts.git;a=commitdiff;h=0a676a4
The following commit has been merged in the kubuntu_unstable branch:
commit 0a676a443170d91f12b7c4b0cb97ef95bb2913da
Merge: a06566ea70f5b1c7b5b5cddbb9d9bcd84669ed21 f1b70d0a607d2411e4f9aab19e7f98e88350c67d
Author: Harald Sitter <sitter at kde.org>
Date: Thu Jul 2 07:53:00 2015 +0200
Merge branch 'master' into kubuntu_unstable
Conflicts:
debian/control
debian/changelog | 7 +++++++
debian/control | 32 ++++++++++++++++----------------
2 files changed, 23 insertions(+), 16 deletions(-)
diff --cc debian/changelog
index 13270ba,41a04d0..7523eb9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ kparts (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 10:31:58 +0200
+
+kparts (5.10.0-0ubuntu1) wily; urgency=medium
+
+ [ Maximiliano Curia ]
+ * New upstream release (5.10.0).
+
+ [ Jonathan Riddell ]
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 03 Jun 2015 20:50:07 +0200
+
kparts (5.9.0-1) experimental; urgency=medium
* New upstream release (5.9.0).
diff --cc debian/control
index 973fdf6,91b8943..4397dd3
--- a/debian/control
+++ b/debian/control
@@@ -5,19 -5,19 +5,19 @@@ 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),
- kio-dev (>= 5.10.0),
- libkf5config-dev (>= 5.10.0),
- libkf5coreaddons-dev (>= 5.10.0),
- libkf5i18n-dev (>= 5.10.0),
- libkf5iconthemes-dev (>= 5.10.0),
+ extra-cmake-modules (>= 5.11.0~),
+ kio-dev (>= 5.11.0~),
+ libkf5config-dev (>= 5.11.0~),
+ libkf5coreaddons-dev (>= 5.11.0~),
+ libkf5i18n-dev (>= 5.11.0~),
+ libkf5iconthemes-dev (>= 5.11.0~),
- libkf5itemviews-dev (>= 5.7.0),
+ libkf5itemviews-dev (>= 5.10.0),
- libkf5jobwidgets-dev (>= 5.10.0),
- libkf5notifications-dev (>= 5.10.0),
- libkf5service-dev (>= 5.10.0),
- libkf5textwidgets-dev (>= 5.10.0),
- libkf5widgetsaddons-dev (>= 5.10.0),
- libkf5xmlgui-dev (>= 5.10.0),
+ libkf5jobwidgets-dev (>= 5.11.0~),
+ libkf5notifications-dev (>= 5.11.0~),
+ libkf5service-dev (>= 5.11.0~),
+ libkf5textwidgets-dev (>= 5.11.0~),
+ libkf5widgetsaddons-dev (>= 5.11.0~),
+ libkf5xmlgui-dev (>= 5.11.0~),
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev (>= 5.4),
xauth,
--
kparts packaging
More information about the pkg-kde-commits
mailing list