[SCM] muon packaging branch, kubuntu_vivid_backports, updated. e2e667aab17902ff5fd3c55329767e72a3e13406

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_backports branch:
commit e2e667aab17902ff5fd3c55329767e72a3e13406
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed May 27 19:00:28 2015 -0700

    Vivid backport
    
    * Vivid backport
    * wrap-and-sort
---
 debian/changelog             | 9 +++++++--
 debian/muon-notifier.install | 4 ++--
 debian/muon.install          | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4319d5a..0ecb41c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-muon (4:5.3.0-0ubuntu1) UNRELEASED; urgency=medium
+muon (4:5.3.1-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Jonathan Riddell ]
   * Plasma 5.3 beta
   * Add muon-notifier.mo
   * new upstream release
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 Apr 2015 17:06:12 +0200
+  [ Scarlett Clark ]
+  * Vivid backport
+  * wrap-and-sort 
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 27 May 2015 07:44:46 -0700
 
 muon (4:5.2.2-1-0ubuntu4.1) vivid; urgency=medium
 
diff --git a/debian/muon-notifier.install b/debian/muon-notifier.install
index 7e2be36..532e92b 100644
--- a/debian/muon-notifier.install
+++ b/debian/muon-notifier.install
@@ -1,6 +1,6 @@
 usr/lib/*/qt5/qml/org/kde/muonnotifier/
+usr/share/knotifications5/
 usr/share/kservices5/plasma-applet-org.kde.muonnotifier.desktop
+usr/share/locale/*/LC_MESSAGES/muon-notifier.mo
 usr/share/locale/*/LC_MESSAGES/plasma_applet_org.kde.muonnotifier.mo
-usr/share/knotifications5/
 usr/share/plasma/plasmoids/org.kde.muonnotifier/
-usr/share/locale/*/LC_MESSAGES/muon-notifier.mo
diff --git a/debian/muon.install b/debian/muon.install
index 94d9b49..186934a 100644
--- a/debian/muon.install
+++ b/debian/muon.install
@@ -3,5 +3,5 @@ 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/locale/*/LC_MESSAGES/muon.mo
 usr/share/locale/*/LC_MESSAGES/muon-exporter.mo
+usr/share/locale/*/LC_MESSAGES/muon.mo

-- 
muon packaging