[SCM] kmenuedit packaging branch, kubuntu_wily_backports, updated. ubuntu/4%5.4.3-0ubuntu1-21-g63f856e

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 81ee87035568f9180fe21a56de8d312ca8aa07ea
Merge: ffb3a67e3e74fa7157c6459da83ef44afe74ec5a 2ddfe41ea081e1c59d888df816ce41f2fe998202
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Dec 4 21:37:07 2015 -0800

     * New upstream release (5.4.3).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:36 +0100 * New upstream release (5.4.2).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:51:47 +0200 * New upstream release (5.4.1).
    -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:44:54 +0200 * New upstream release (5.4.0).
    -- Maximiliano Curia <maxy at debian.org>  Fri, 04 Sep 2015 13:28:31 +0200 * New upstream release (5.3.0). * New upstream release (5.3.1). * New upstream release (5.3.2). * Update copyright information. * Add the missing Breaks/Replaces.
    -- Maximiliano Curia <maxy at debian.org>  Thu, 02 Jul 2015 11:39:18 +0200
    
     * New upstream release (5.4.3).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:36 +0100
     * New upstream release (5.4.2).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:51:47 +0200
     * New upstream release (5.4.1).
    -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:44:54 +0200
     * New upstream release (5.4.0).
    -- Maximiliano Curia <maxy at debian.org>  Fri, 04 Sep 2015 13:28:31 +0200
     * New upstream release (5.3.0).
     * New upstream release (5.3.1).
     * New upstream release (5.3.2).
     * Update copyright information.
     * Add the missing Breaks/Replaces.
    -- Maximiliano Curia <maxy at debian.org>  Thu, 02 Jul 2015 11:39:18 +0200

 debian/changelog | 51 ++++++++++++++++++++++++++-----------
 debian/control   |  4 ++-
 debian/copyright | 77 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 debian/rules     |  3 +++
 4 files changed, 111 insertions(+), 24 deletions(-)

diff --cc debian/changelog
index b159b56,17acf85..06ea3da
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,52 -1,36 +1,82 @@@
++kmenuedit (4:5.4.3-0ubuntu2) UNRELEASED; urgency=medium
++
++  * Debian merge. No remaining changes. 
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 04 Dec 2015 21:25:32 -0800
++
 +kmenuedit (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:31:31 +0100
 +
+ kmenuedit (4:5.4.3-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:36 +0100
+ 
+ kmenuedit (4:5.4.2-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:51:47 +0200
+ 
 +kmenuedit (4:5.4.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Vivid backport
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 05 Oct 2015 11:44:38 -0700
 +
 +kmenuedit (4:5.4.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 02 Oct 2015 15:54:15 +0100
 +
+ kmenuedit (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:44:54 +0200
+ 
 +kmenuedit (4:5.4.1-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 08 Sep 2015 10:16:36 +0100
 +
+ kmenuedit (4:5.4.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 04 Sep 2015 13:28:31 +0200
+ 
 +kmenuedit (4:5.4.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 31 Aug 2015 15:50:23 +0100
 +
 +kmenuedit (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:14:17 +0200
 +
- kmenuedit (4:5.3.2-0ubuntu1) wily; urgency=medium
+ kmenuedit (4:5.3.2-1) unstable; urgency=medium
  
-   * New upstream release
+   * New upstream release (5.3.0).
+   * New upstream release (5.3.1).
+   * New upstream release (5.3.2).
+   * Update copyright information.
+   * Add the missing Breaks/Replaces.
  
-  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 12:28:21 +0000
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 02 Jul 2015 11:39:18 +0200
  
  kmenuedit (4:5.3.1-0ubuntu1) wily; urgency=medium
  

-- 
kmenuedit packaging