[SCM] kdoctools packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-4-gb8c860b
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Fri Jul 10 21:21:48 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdoctools.git;a=commitdiff;h=b8c860b
The following commit has been merged in the kubuntu_unstable branch:
commit b8c860b373860f33acfc97825606502917eec623
Merge: 29b8d5d14864dd41a599eff64bd1a4c5580dbb28 18f3f11f1a14001c20b89b79192388e8f0e01062
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Fri Jul 10 14:21:06 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
Conflicts:
debian/changelog
debian/control
debian/changelog | 8 ++++++++
debian/control | 9 +++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --cc debian/changelog
index 9f8c74c,f24c72a..644b46a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,17 @@@
-kdoctools (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+kdoctools (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:16:10 -0700
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 08:07:08 -0700
+ kdoctools (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> Sat, 27 Jun 2015 11:43:24 +0200
+
kdoctools (5.10.0-0ubuntu1) wily; urgency=medium
[ Maximiliano Curia ]
diff --cc debian/control
index 1de52c5,e213614..d618b8e
--- a/debian/control
+++ b/debian/control
@@@ -7,9 -7,9 +7,9 @@@ Build-Depends: cmake (>= 2.8.12)
debhelper (>= 9),
docbook-xml (>= 4.5),
docbook-xsl,
- extra-cmake-modules (>= 5.10.0),
- libkf5archive-dev (>= 5.12.0),
- libkf5i18n-dev (>= 5.12.0),
- extra-cmake-modules (>= 5.11.0~),
- libkf5archive-dev (>= 5.11.0~),
- libkf5i18n-dev (>= 5.11.0~),
++ extra-cmake-modules (>= 5.12.0~),
++ libkf5archive-dev (>= 5.12.0~),
++ libkf5i18n-dev (>= 5.12.0~),
liburi-perl,
libxml2-dev,
libxml2-utils,
@@@ -25,7 -25,7 +25,7 @@@ Package: kdoctools-de
Section: libdevel
Architecture: any
Depends: kdoctools5 (= ${binary:Version}),
- libkf5archive-dev (>= 5.12.0),
- libkf5archive-dev (>= 5.11.0~),
++ libkf5archive-dev (>= 5.12.0~),
qtbase5-dev (>= 5.4),
${misc:Depends}
Description: Development files for kdoctools5
--
kdoctools packaging
More information about the pkg-kde-commits
mailing list