[SCM] kdecoration packaging branch, master, updated. debian/5.2.0-1-30-g01ac21a

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 74434bb2bceb5508d56858b32cc0bfd73092137a
Merge: 3734dfc11545509bc34cb55f02ee3fa5d6998af8 981a5c1964f13cde5c2db242ccc72df72671edf8
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 10:36:07 2015 +0100

    Merge commit '981a5c1964f13cde5c2db242ccc72df72671edf8'
    
    Conflicts:
    	debian/control
    	debian/rules
    	debian/tests/control
    	debian/tests/testsuite.xsession

 debian/changelog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --cc debian/changelog
index bc9abd2,9c8269a..4184c3c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,15 +1,36 @@@
 +kdecoration (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 10:00:14 +0100
 +
+ kdecoration (4:5.2.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:12:56 -0700
+ 
+ kdecoration (4:5.2.1-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:37:12 -0800
+ 
 +kdecoration (4:5.2.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Update copyright information.
 +  * Add myself as Uploader.
 +  * Update install files.
 +  * Add acc autopkgtests.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Add missing dev dependency (thanks to acc headers check)
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 07 Feb 2015 15:42:34 +0100
 +
  kdecoration (4:5.2.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kdecoration packaging