[SCM] khelpcenter packaging branch, kubuntu_unstable, updated. 32a35461f8a6d7a787591de14ed30316541bb74a

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/khelpcenter.git;a=commitdiff;h=32a3546

The following commit has been merged in the kubuntu_unstable branch:
commit 32a35461f8a6d7a787591de14ed30316541bb74a
Merge: 2639cad053ab85f3851e438b46201c3280e3c96e b0297458ca76d9bc367867b413160679c026184d
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:10:33 2015 +0200

    merge master

 debian/.gitattributes           |   1 +
 debian/changelog                |  36 ++--
 debian/control                  |  25 +--
 debian/copyright                | 372 +++++-----------------------------------
 debian/khelpcenter.install      |  19 +-
 debian/not-installed            |   3 +
 debian/source/lintian-overrides |   1 -
 debian/watch                    |   5 +-
 8 files changed, 107 insertions(+), 355 deletions(-)

diff --cc debian/changelog
index d974a3e,3a4bf1b..fa00285
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,16 +1,43 @@@
 +khelpcenter (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:26:06 +0200
 +
 +khelpcenter (4:5.3.1-0ubuntu2) wily; urgency=medium
 +
 +  * khelpcenter now depends on kdoctools5, this allows the program to load
 +    themes. (LP: #1362753)
 +
 + -- José Manuel Santamaría Lema <panfaust at gmail.com>  Tue, 09 Jun 2015 02:22:38 +0200
 +
 +khelpcenter (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * Plasma 5.3 beta
 +  * new upstream release
 +
 +  [ Scarlett Clark ]
 +  * Vivid backport
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:28:39 +0200
 +
- khelpcenter (4:5.2.2a-0ubuntu1) vivid; urgency=medium
+ khelpcenter (4:5.3.1-1~) UNRELEASED; urgency=medium
  
-   * New upstream release
-   * New upstream tarball.
+   * New upstream release (5.3.0).
+   * New upstream release (5.3.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:55:11 +0200
+ 
+ khelpcenter (4:5.2.2-1) experimental; urgency=medium
+ 
+   * New upstream release (5.2.1).
+   * New upstream release (5.2.2).
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:15:52 -0700
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:35 +0100
  
  khelpcenter (4:5.2.1-0ubuntu1) vivid; urgency=medium
  

-- 
khelpcenter packaging