[SCM] kmenuedit packaging branch, master, updated. df045ae9ff024135f678c069f83ed4531ab09077

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0c482b456ff1399d08dab647c043e940a7412cfb
Merge: 7d5a97a55492e55243df009a17f41151b9bab878 2971aaa9ed75e81ea0bdc1068ef9de2fbfffb742
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 10:45:49 2015 +0100

    Merge commit '2971aaa9ed75e81ea0bdc1068ef9de2fbfffb742'

 debian/changelog              | 12 ++++++++++++
 debian/meta/upstream_scm.json |  1 -
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 854c0c5,ea6c1fa..9bab697
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,33 @@@
 +kmenuedit (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:49:01 +0100
 +
+ kmenuedit (4:5.2.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:20:47 -0700
+ 
+ kmenuedit (4:5.2.1-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:40:21 -0800
+ 
 +kmenuedit (4:5.2.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Add myself as Uploader.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 12 Feb 2015 22:05:52 +0100
 +
  kmenuedit (4:5.2.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kmenuedit packaging