[SCM] plasma-mediacenter packaging branch, kubuntu_wily_backports, updated. ubuntu/4%5.4.3-0ubuntu1-20-g2adbda9

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 2adbda94089798a166ff3de51870d4b914d64089
Merge: f735ede42f107da908daf7b12c8f1d30f8ae3e68 cca3593b94dbb9377933bb34d453e8e3a488a18a
Author: Philip Muškovac <yofel at gmx.net>
Date:   Fri Jan 8 20:02:33 2016 +0100

    Merge branch 'kubuntu_xenial_archive' into kubuntu_wily_backports

 debian/changelog | 26 ++++++++++++++++++++------
 debian/control   | 28 ++++++++++++++--------------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --cc debian/changelog
index 4aa481c,07dbdbe..1a6ad9b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,25 +1,30 @@@
- plasma-mediacenter (4:5.4.3-0ubuntu1) UNRELEASED; urgency=medium
+ plasma-mediacenter (4:5.5.3-0ubuntu1) UNRELEASED; urgency=medium
  
-   * New upstream bugfix release
+   [ Scarlett Clark ]
+   * New upstream release Xenial
+ 
+   [ Clive Johnston ]
+   * new upstream release
+   * New upstream release
+ 
+  -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 18:00:58 +0000
+ 
+ plasma-mediacenter (4:5.4.3-0ubuntu1) xenial; urgency=medium
+ 
+   * New upstream bugfix release (LP: #1518598)
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 22 Nov 2015 16:42:12 +0100
  
-  -- Scarlett Clark <sgclark at kubuntu.org> Wed, 09 Nov 2015 11:00:00  
-  
  plasma-mediacenter (4:5.4.2-0ubuntu1) wily; urgency=medium
  
-   * New upstream release
-   * Create backports branch. 
    * New upstream bugfix release
++<<<<<<< HEAD
 + 
 + -- Scarlett Clark <sgclark at kubuntu.org> Wed, 09 Nov 2015 11:00:00   
++=======
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 02 Oct 2015 16:00:16 +0100
++>>>>>>> kubuntu_xenial_archive
  
  plasma-mediacenter (4:5.4.1-0ubuntu1) wily; urgency=medium
  

-- 
plasma-mediacenter packaging