[SCM] muon packaging branch, master, updated. 538dd55ec2c59e5d9e9069420ae38786df4c7bb9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d36f3823d9f7550530057ef1cc9a35ecfb89ec7a
Merge: ce82e17bb457fd58b12bb7c7419dc08651299e5b 908b1a208adb323bf33247fee9f77b12abea7b63
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 11:09:30 2015 +0100

    Merge commit '908b1a208adb323bf33247fee9f77b12abea7b63'

 debian/changelog    | 38 ++++++++++++++++++++++++++++++++++++++
 debian/muon.install |  1 +
 2 files changed, 39 insertions(+)

diff --cc debian/changelog
index 9134111,0a32375..016383d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,41 +1,58 @@@
+ muon (4:5.2.2a-0ubuntu1) vivid; urgency=medium
+ 
+   * Add back muon-installer.mo
+   * Fixed upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 24 Mar 2015 23:06:35 +0100
+ 
 +muon (4:5.2.2-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.2.1).
 +  * New upstream release (5.2.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 09:48:55 +0100
 +
+ muon (4:5.2.2-0ubuntu2) vivid; urgency=medium
+ 
+   * Remove muon-installer.mo from .install no longer included
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 24 Mar 2015 20:09:49 +0100
+ 
+ muon (4:5.2.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:36:31 -0700
+ 
+ muon (4:5.2.1+git20150304-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream snapshot to get fixed categories
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 04 Mar 2015 18:05:04 +0100
+ 
+ muon (4:5.2.1git20150304-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream snapshot
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 04 Mar 2015 15:33:43 +0100
+ 
+ muon (4:5.2.1-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release 
+   * Add missing .mo files
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:45:04 -0800
+ 
 +muon (4:5.2.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Add myself as Uploader.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Feb 2015 10:13:40 +0100
 +
  muon (4:5.2.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
muon packaging