[SCM] plasma-mediacenter packaging branch, kubuntu_wily_archive, updated. 0df311fbc94eee9f39f785f6954221e879bee1ff

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 0df311fbc94eee9f39f785f6954221e879bee1ff
Merge: 3dee808ef034952d600c1af672224ca479d29a96 be5eb36774a6f7564fd16a7dfb0dfa820ed84be9
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:43:11 2015 +0200

    merge master

 debian/changelog                                   |  15 +-
 debian/control                                     |  34 +--
 debian/copyright                                   | 299 ++++++++++++++++-----
 debian/patches/series                              |   1 +
 ...place_reference_to_license_with_the_bsd_license |  42 +++
 debian/plasma-mediacenter.install                  |  14 +-
 debian/watch                                       |   2 +-
 7 files changed, 319 insertions(+), 88 deletions(-)

diff --cc debian/changelog
index d392e30,9c2b2f3..6c8a4e5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,14 +1,25 @@@
 +plasma-mediacenter (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:33:40 +0200
 +
 +plasma-mediacenter (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
+ 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
+ 
+ plasma-mediacenter (4:5.3.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
    [ Harald Sitter ]
    * KDE Frameworks 5 port
  
diff --cc debian/plasma-mediacenter.install
index 6c4f5ef,16657a7..0dc06bb
--- a/debian/plasma-mediacenter.install
+++ b/debian/plasma-mediacenter.install
@@@ -2,9 -3,10 +3,10 @@@ usr/lib/*/libplasmamediacenter.so.5.
  usr/lib/*/qt5/plugins/plasma/mediacenter/
  usr/lib/*/qt5/qml/org/kde/plasma/mediacenter/
  usr/share/applications/plasma-mediacenter.desktop
- usr/share/icons/hicolor/
- usr/share/kservices5/
- usr/share/kservicetypes5/
- usr/share/locale/
+ usr/share/icons/hicolor/*/actions/pmc-back.png
+ usr/share/kservices5/plasma-shell-org.kde.plasma.mediacenter.desktop
+ usr/share/kservicetypes5/pmc_*.desktop
 -usr/share/locale/*/*/plasma_shell_org.kde.plasma.mediacenter.mo
+ usr/share/locale/*/*/plasma-mediacenter.mo
++usr/share/locale/*/*/plasma_shell_org.kde.plasma.mediacenter.mo
  usr/share/plasma/shells/org.kde.plasma.mediacenter/
- usr/share/xsessions/
+ usr/share/xsessions/plasma-mediacenter.desktop

-- 
plasma-mediacenter packaging