[SCM] khelpcenter packaging branch, kubuntu_wily_backports, updated. ubuntu/4%5.4.3-0ubuntu1-35-g9a6c755

Fri Jan 8 19:03:26 UTC 2016

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit f2145b078231ca7946b1414b342ca96a38b53f1d
Merge: 7a35bb260037c144a3677303131098dfb9d1ad76 a642d939abae6679b555fe5e46a04e8b759bbcd2
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Dec 4 20:12:24 2015 -0800

     * New upstream release (5.4.3).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:50 +0100 * New upstream release (5.4.2).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:52:04 +0200 * New upstream release (5.4.1).
    -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:12 +0200 * Correct the bug number closed in the previous upload * New upstream release (5.4.0).
    -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 14:05:29 +0200 * Add versionned Breaks/Replaces against all kde-l10n packages in jessie, as this package now ships its own translations - Bump Build-Depends against pkg-kde-tools to 0.15.18~ - Use its new l10n-packages.mk with a kde-l10n fixed version 4:4.14.0-2~ (Closes: #790799, #790861)
    -- Didier Raboud <odyx at debian.org>  Fri, 03 Jul 2015 12:17:43 +0200 * New upstream release (5.3.2). * Update copyright information.
    -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 20:39:15 +0200
    
     * New upstream release (5.4.3).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:50 +0100
     * New upstream release (5.4.2).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:52:04 +0200
     * New upstream release (5.4.1).
    -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:12 +0200
     * Correct the bug number closed in the previous upload
     * New upstream release (5.4.0).
    -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 14:05:29 +0200
     * Add versionned Breaks/Replaces against all kde-l10n packages in
       jessie, as this package now ships its own translations
       - Bump Build-Depends against pkg-kde-tools to 0.15.18~
       - Use its new l10n-packages.mk with a kde-l10n fixed version 4:4.14.0-2~
       (Closes: #790799, #790861)
    -- Didier Raboud <odyx at debian.org>  Fri, 03 Jul 2015 12:17:43 +0200
     * New upstream release (5.3.2).
     * Update copyright information.
    -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 20:39:15 +0200

 debian/changelog     |  81 ++++++++++++++++++++++++++++++++------
 debian/control       |  11 ++++--
 debian/copyright     | 107 ++++++++++++++++++++++++++++++++++++++++++---------
 debian/not-installed |   3 --
 debian/rules         |   7 ++++
 5 files changed, 173 insertions(+), 36 deletions(-)

diff --cc debian/changelog
index 8903c3e,f900fba..70f20f1

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,52 -1,47 +1,88 @@@
++khelpcenter (4:5.4.3-0ubuntu2) UNRELEASED; urgency=medium
++
++  * Debian merge: No remaining changes. 
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 04 Dec 2015 20:03:38 -0800
++
 +khelpcenter (4:5.4.3-0ubuntu1) xenial; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream bugfix release
 +
 +  [ Philip Muškovac ]
 +  * New upstream bugfix release (LP: #1518598)
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Sun, 22 Nov 2015 16:30:16 +0100
 +
- khelpcenter (4:5.4.2-0ubuntu1) UNRELEASED; urgency=medium
+ khelpcenter (4:5.4.3-1) unstable; urgency=medium
  
-   * Vivid backport
+   * New upstream release (5.4.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:50 +0100
+ 
+ khelpcenter (4:5.4.2-1) unstable; urgency=medium
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 05 Oct 2015 11:41:45 -0700
+   * New upstream release (5.4.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:52:04 +0200
  
 +khelpcenter (4:5.4.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 02 Oct 2015 15:53:20 +0100
 +
+ khelpcenter (4:5.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:12 +0200
+ 
 +khelpcenter (4:5.4.1-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 08 Sep 2015 10:15:36 +0100
 +
+ khelpcenter (4:5.4.0-1) unstable; urgency=medium
+ 
+   [ Didier Raboud ]
+   * Correct the bug number closed in the previous upload
+ 
+   [ Maximiliano Curia ]
+   * New upstream release (5.4.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 14:05:29 +0200
+ 
 +khelpcenter (4:5.4.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 31 Aug 2015 15:49:23 +0100
 +
 +khelpcenter (4:5.3.95-0ubuntu1) wily; urgency=medium
 +
-   [ Scarlett Clark ]
-   * Vivid backport. 
- 
-   [ Jonathan Riddell ]
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 23:13:15 +0200
 +
- khelpcenter (4:5.3.2-0ubuntu1) wily; urgency=medium
+ khelpcenter (4:5.3.2-2) unstable; urgency=medium
  
-   * New upstream release
+   * Add versionned Breaks/Replaces against all kde-l10n packages in
+     jessie, as this package now ships its own translations
+     - Bump Build-Depends against pkg-kde-tools to 0.15.18~
+     - Use its new l10n-packages.mk with a kde-l10n fixed version 4:4.14.0-2~
+     (Closes: #790799, #790861)
+ 
+  -- Didier Raboud <odyx at debian.org>  Fri, 03 Jul 2015 12:17:43 +0200
+ 
+ khelpcenter (4:5.3.2-1) unstable; urgency=medium
+ 
+   * New upstream release (5.3.2).
+   * Update copyright information.
  
-  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 12:27:23 +0000
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 20:39:15 +0200
++>>>>>>> master
  
  khelpcenter (4:5.3.1-0ubuntu2) wily; urgency=medium
  
diff --cc debian/rules
index 6fdbcb8,44784f9..8ee2bdf
--- a/debian/rules
+++ b/debian/rules
@@@ -2,6 -2,10 +2,13 @@@
  # -*- makefile -*-
  
  include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
++<<<<<<< HEAD
++=======
+ 
+ # Add kde-l10n:all substvar
+ l10npkgs_firstversion_ok := 4:4.14.0-2~
+ include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
++>>>>>>> master
  
  override_dh_strip:
  	$(overridden_command) --dbg-package=khelpcenter-dbg

-- 
khelpcenter packaging

