[SCM] kdoctools packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-4-g67cafe2

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdoctools.git;a=commitdiff;h=15606e7

The following commit has been merged in the kubuntu_unstable branch:
commit 15606e7644f27cd02e0ebc06d0ce6ed3425163bd
Merge: 383030f2a78fc4ec7b0443162c59e2a782ead81c 28e772808dd980313cfd7647163b9a7453582ed6
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 5 09:52:07 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control
    	debian/copyright
    	debian/kdoctools5.install

 debian/changelog     | 35 +++++++++++++++++++++++++++++++++++
 debian/control       |  8 ++++----
 debian/not-installed | 26 ++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 3f44b72,a264af1..9317f06
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,38 +1,60 @@@
 +kdoctools (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:35:42 +0100
 +
+ kdoctools (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:49:20 +0100
+ 
 +kdoctools (5.6.0-1) experimental; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * Remove obsolete patch missing-all-l10n.xml.diff fixed upstream
 +
 +  [ Maximiliano Curia ]
 +  * 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 watch file.
 +  * Update build dependencies to follow cmake.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 26 Jan 2015 14:10:34 +0100
 +
+ kdoctools (5.6.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 06 Jan 2015 20:10:27 +0100
+ 
+ kdoctools (5.5.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 11:10:45 +0100
+ 
+ kdoctools (5.4.0-0ubuntu1) vivid; urgency=medium
+ 
+   [ Rohan Garg ]
+   * New upstream build-dep on ki18n, NOT kdesu
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Nov 2014 15:12:12 +0100
+ 
+ kdoctools (5.3.0-0ubuntu1) utopic; urgency=medium
+ 
+   * Remove obsolete patch missing-all-l10n.xml.diff fixed upstream
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 Oct 2014 11:21:28 +0100
+ 
  kdoctools (5.2.0-0ubuntu1) utopic; urgency=medium
  
    * New upstream release
diff --cc debian/control
index b4c1182,c6351bc..04b7a48
--- a/debian/control
+++ b/debian/control
@@@ -3,13 -3,13 +3,13 @@@ Section: lib
  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 (>= 9.0.0),
 -               docbook-xml,
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
 +               docbook-xml (>= 4.5),
                 docbook-xsl,
-                extra-cmake-modules (>= 1.6.0),
-                libkf5archive-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
+                libkf5archive-dev (>= 5.7.0),
+                libkf5i18n-dev (>= 5.7.0),
                 libxml2-dev,
                 libxml2-utils,
                 libxslt1-dev,
@@@ -24,16 -24,13 +24,16 @@@ Package: kdoctools-de
  Section: libdevel
  Architecture: any
  Depends: kdoctools5 (= ${binary:Version}),
-          libkf5archive-dev (>= 5.6.0),
+          libkf5archive-dev (>= 5.7.0),
 -         qtbase5-dev,
 +         qtbase5-dev (>= 5.2.0),
           ${misc:Depends}
 -Description: Documentation generation from docbook
 - Tools to read documentation in Docbook.
 +Description: Development files for kdoctools5
 + KDocTools is a set of tools to generate documentation in various formats from
 + DocBook files.
   .
 - Contains development files for kdoctools.
 + This package is part of KDE Frameworks 5.
 + .
 + This package contains the development files for kdoctools5.
  
  Package: kdoctools5
  Section: doc

-- 
kdoctools packaging