[SCM] muon packaging branch, master, updated. ef3a6ef2621e3f400f9469961fa275788c8a9897

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b825dfad9427f14e8c02dd895e0c1c1385cf844b
Merge: ec0e64ef061c4922c9323f48aaf7f942fe20a375 1d5088b1342e3d4163bdb83d9c95db38faa99a08
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jun 30 22:49:59 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_unstable'

 debian/changelog              | 60 +++++++++++++++++++++++++++++++++++++++++++
 debian/meta/upstream_scm.json |  1 -
 debian/muon-notifier.install  |  3 +--
 3 files changed, 61 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index fbb778f,51b4766..aa36e9f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,64 +1,70 @@@
 +muon (4:5.3.2-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.3.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:20:00 +0200
 +
+ 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.3.1-1~) UNRELEASED; urgency=medium
 +muon (4:5.3.1-1) unstable; urgency=medium
  
    * New upstream release (5.2.1).
    * New upstream release (5.2.2).

-- 
muon packaging