[SCM] kdoctools packaging branch, master, updated. f2fbef85e6d601a1423881cc50c8cb32622511e3

[Jonathan Riddell]

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

The following commit has been merged in the master branch:
commit f2fbef85e6d601a1423881cc50c8cb32622511e3
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Sep 23 19:04:14 2014 +0200

    sync with Kubuntu 5.2.0
---
 debian/changelog | 14 ++++++++++++++
 debian/control   |  8 ++++----
 debian/copyright | 40 ++++++++++++++++++++--------------------
 debian/rules     |  2 +-
 4 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b5c3de..49f2131 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+kdoctools (5.2.0-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+  * Use pkg-kde-tools version 3 scripts
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 22 Sep 2014 19:39:27 +0200
+
+kdoctools (5.1.0-0ubuntu1) utopic; urgency=medium
+
+  * Cleanup copyright file.
+  * New upstream release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 05 Aug 2014 17:10:45 +0200
+
 kdoctools (5.0.0-0ubuntu1) utopic; urgency=medium
 
   * Initial stable upstream release
diff --git a/debian/control b/debian/control
index 5fb25a0..9b58064 100644
--- a/debian/control
+++ b/debian/control
@@ -8,12 +8,12 @@ Build-Depends: cmake,
                debhelper (>= 9.0.0),
                docbook-xml,
                docbook-xsl,
-               extra-cmake-modules (>= 1.0.0),
-               libkf5archive-dev (>= 5.0.0),
+               extra-cmake-modules (>= 1.2.0),
+               libkf5archive-dev (>= 5.2.0),
                libxml2-dev,
                libxml2-utils,
                libxslt1-dev,
-               pkg-kde-tools,
+               pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev
 Standards-Version: 3.9.5
 Homepage: https://projects.kde.org/projects/frameworks/kdoctools
@@ -24,7 +24,7 @@ Package: kdoctools-dev
 Section: libdevel
 Architecture: any
 Depends: kdoctools5 (= ${binary:Version}),
-         libkf5archive-dev (>= 5.0.0),
+         libkf5archive-dev (>= 5.2.0),
          qtbase5-dev,
          ${misc:Depends}
 Description: Documentation generation from docbook
diff --git a/debian/copyright b/debian/copyright
index d4702de..1348e52 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,26 +10,26 @@ Copyright: © 2010 Luigi Toscano <luigi.toscano at tiscali.it>
            © 2006-2009 Alexander Neundorf <neundorf at kde.org>
            2014 Scarlett Clark <sgclark at kubuntu.org>
 License: MIT
- | Permission is hereby granted, free of charge, to any person
- | obtaining a copy of this software and associated documentation
- | files (the "Software"), to deal in the Software without
- | restriction, including without limitation the rights to use,
- | copy, modify, merge, publish, distribute, sublicense, and/or sell
- | copies of the Software, and to permit persons to whom the
- | Software is furnished to do so, subject to the following
- | conditions:
- |
- | The above copyright notice and this permission notice shall be
- | included in all copies or substantial portions of the Software.
- |
- | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- | EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- | OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- | NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- | HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- | WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- | FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- | OTHER DEALINGS IN THE SOFTWARE.
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
 
 Files: src/docbookl10nhelper.cpp
 Copyright: 2010 Luigi Toscano <luigi.toscano at tiscali.it>
diff --git a/debian/rules b/debian/rules
index 36158bb..08f9b50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=kdoctools5-dbg

-- 
kdoctools packaging