[SCM] plasma-mediacenter packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.2-0ubuntu1-10-g829eeb5

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 829eeb58bd6058d267123c60ceab29147cfdec07
Merge: 4bbaccc42d2d838e6ba9d5ab8d4454bf3eadeac1 50de43d5936c77f62f4b3ab1c8b2d4bd35e6e101
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Oct 8 06:07:02 2015 -0700

    manual merge

 debian/changelog                            |  55 ++++-
 debian/control                              |  36 ++--
 debian/copyright                            | 299 ++++++++++++++++++++++------
 debian/plasma-mediacenter.install           |  14 +-
 debian/plasma-mediacenter.lintian-overrides |   1 +
 debian/watch                                |   2 +-
 6 files changed, 317 insertions(+), 90 deletions(-)

diff --cc debian/changelog
index 0f07f14,1e71b40..20ae82f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,54 +1,63 @@@
- plasma-mediacenter (4:5.4.2-0ubuntu1) UNRELEASED; urgency=medium
++plasma-mediacenter (4:5.4.2-0ubuntu2) UNRELEASED; urgency=medium
 +
 +  * Fix version 
 +  * Vivid backport
 +  * Files do not match. Manual merge. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 05 Oct 2015 12:11:18 -0700
 +
+ plasma-mediacenter (4:5.4.2-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 02 Oct 2015 16:00:16 +0100
+ 
+ plasma-mediacenter (4:5.4.1-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 08 Sep 2015 10:23:29 +0100
+ 
+ plasma-mediacenter (4:5.4.0-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 31 Aug 2015 15:55:20 +0100
+ 
+ plasma-mediacenter (4:5.3.95-0ubuntu2) wily; urgency=medium
+ 
+   * No-change rebuild for new baloo-kf5
+ 
+  -- Iain Lane <iain at orangesquash.org.uk>  Sun, 16 Aug 2015 13:03:11 +0100
+ 
+ plasma-mediacenter (4:5.3.95-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 23:20:07 +0200
+ 
+ plasma-mediacenter (4:5.3.2-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 12:37:04 +0000
+ 
+ plasma-mediacenter (5.3.1-1~) UNRELEASED; urgency=medium
+ 
+   * Initial Debian release.
+   * New upstream patch:
+     upstream_replace_reference_to_license_with_the_bsd_license
+   * New upstream release (5.3.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:54:15 +0200
++>>>>>>> origin/kubuntu_unstable
+ 
  plasma-mediacenter (4:5.3.0-0ubuntu1) UNRELEASED; urgency=medium
  
+   [ Harald Sitter ]
    * KDE Frameworks 5 port
  
-  -- Harald Sitter <sitter at kde.org>  Fri, 13 Feb 2015 13:25:51 +0100
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:40:53 +0200
  
  plasma-mediacenter (1.3.0-0ubuntu4) utopic; urgency=medium
  

-- 
plasma-mediacenter packaging