[SCM] muon packaging branch, kubuntu_wily_archive, updated. 52a1eeaae943f68ffb4b41fbefa6c9593065f8e8

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 52a1eeaae943f68ffb4b41fbefa6c9593065f8e8
Merge: f2f43a6bd90983f6402970269598c66bedf81ff3 5ea04c50dacdde432b0b9071e8baf80e8766124d
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:35:59 2015 +0200

    merge master

 debian/.gitattributes            |   1 +
 debian/changelog                 |  20 ++-
 debian/control                   |  27 ++--
 debian/copyright                 | 268 +++++++++++++++++++++++++++++++++------
 debian/libmuon.install           |   2 +-
 debian/libmuon.lintian-overrides |   4 +-
 debian/muon.install              |   2 +-
 debian/not-installed             |   3 +-
 debian/rules                     |   3 +-
 debian/watch                     |   2 +-
 10 files changed, 271 insertions(+), 61 deletions(-)

diff --cc debian/changelog
index 87d4256,c916063..51b4766
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,69 -1,11 +1,71 @@@
 +muon (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:31:23 +0200
 +
 +muon (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * Plasma 5.3 beta
 +  * Add muon-notifier.mo
 +  * new upstream release
 +
 +  [ Scarlett Clark ]
 +  * Vivid backport
 +  * wrap-and-sort 
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:37:53 +0200
 +
 +muon (4:5.2.2-1-0ubuntu4.2) vivid; urgency=medium
 +
 +  * Add upstream_init-application-notifier.diff LP: #1461725 to initialise
 +    the application notifier
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Jun 2015 02:42:46 +0200
 +
 +muon (4:5.2.2-1-0ubuntu4.1) vivid; urgency=medium
 +
 +  * Add upstream_notifications.diff from upstream to prevent repeated
 +    notification popups LP: #1449583
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Apr 2015 16:10:36 +0200
 +
 +muon (4:5.2.2-1-0ubuntu4) vivid; urgency=medium
 +
 +  * Add upstream_notifyrc-path.diff to fix install location of notifyrc
 +    files
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Apr 2015 12:09:05 +0200
 +
 +muon (4:5.2.2-1-0ubuntu3) vivid; urgency=medium
 +
 +  * Replace kubuntu_detect-kdelibs4support.diff with upstream format-patch
 +    upstream_check-for-KDELibs4Support.patch (no code change)
 +  * Add upstream patch upstream_Change-Join-the-Game-url.patch fixing the
 +    kde-join-the-game URL in the default muon-discover banner
 +  * Add upstream patch to make sure muon PM can load its xmlgui file
 +    upstream_Make-sure-the-proper-xmlgui-file-is-loaded.patch
 +
 + -- Harald Sitter <sitter at kde.org>  Wed, 01 Apr 2015 09:08:53 +0200
 +
 +muon (4:5.2.2-1-0ubuntu2) vivid; urgency=medium
 +
 +  * Add build-dep on libkf5kdelibs4support-dev and kubuntu_detect-kdelibs4support.diff
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 25 Mar 2015 09:59:22 +0100
 +
- muon (4:5.2.2-1-0ubuntu1) vivid; urgency=medium
+ muon (4:5.3.1-1~) UNRELEASED; urgency=medium
  
-   * Add back muon-installer.mo
-   * Fixed upstream release
+   * New upstream release (5.2.1).
+   * New upstream release (5.2.2).
+   * New upstream release (5.3.0).
+   * New upstream release (5.3.1).
  
-  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 24 Mar 2015 23:06:35 +0100
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:52:00 +0200
  
  muon (4:5.2.2-0ubuntu2) vivid; urgency=medium
  
diff --cc debian/muon.install
index 186934a,1c6dbaf..b4eb2bd
--- a/debian/muon.install
+++ b/debian/muon.install
@@@ -2,6 -2,5 +2,6 @@@ usr/bin/muo
  usr/share/applications/muon.desktop
  usr/share/config.kcfg/muon.kcfg
  usr/share/icons/hicolor/*/apps/muon.*
- usr/share/kxmlgui5/muon/muonui.rc
+ usr/share/kxmlgui5/muon/
 +usr/share/locale/*/LC_MESSAGES/muon-exporter.mo
  usr/share/locale/*/LC_MESSAGES/muon.mo

-- 
muon packaging