Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kguiaddons.git;a=commitdiff;h=bd8eb33
The following commit has been merged in the kubuntu_wily_archive branch:
commit bd8eb33c1dd7e661262ffdadb8fc71a17781421e
Merge: c4883a99638f1e82b594fb3acba139250f156f55 f256ecd1f27c9662006ba26e8adc62bd815759d8
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Mon Mar 2 14:53:12 2015 +0100
Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
Conflicts:
debian/changelog
debian/control
debian/copyright
debian/changelog | 30 ++++++++++++++++++++++++++++++
debian/control | 2 +-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --cc debian/changelog
index 714ae3b,05c63fb..469ee50
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,33 +1,52 @@@
+kguiaddons (5.7.0-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.7.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 24 Feb 2015 17:38:00 +0100
+
+ kguiaddons (5.7.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Harald Sitter <sitter at kde.org> Tue, 10 Feb 2015 16:28:50 +0100
+
+kguiaddons (5.6.0-1) experimental; urgency=medium
+
+ * New upstream release (5.6.0).
+ * Bump build dependencies to build against the experimental versions.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Update install files.
+ * Update copyright information.
+ * Update build dependencies to follow cmake.
+ * Add basic autopkgtests support.
+ * Add libkf5coreaddons-dev -dev dependency, needed by kimagecache.h.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 23 Jan 2015 12:20:19 +0100
+
+ kguiaddons (5.6.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 06 Jan 2015 19:52:25 +0100
+
+ kguiaddons (5.5.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 15 Dec 2014 11:20:00 +0100
+
+ kguiaddons (5.4.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 07 Nov 2014 15:15:32 +0100
+
+ kguiaddons (5.3.0-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 07 Oct 2014 11:28:07 +0100
+
kguiaddons (5.2.0-0ubuntu1) utopic; urgency=medium
* New upstream release
diff --cc debian/control
index 6dd68ad,d7d14ff..8859f40
--- a/debian/control
+++ b/debian/control
@@@ -2,9 -2,9 +2,9 @@@ Source: kguiaddon
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake,
- debhelper (>= 8.0.0),
+Build-Depends: cmake (>= 2.8.12),
+ debhelper (>= 9),
- extra-cmake-modules (>= 1.6.0),
+ extra-cmake-modules (>= 1.7.0),
libqt5x11extras5-dev,
pkg-config,
pkg-kde-tools (>= 0.15.15ubuntu1~),
--
kguiaddons packaging