[SCM] kwin packaging branch, master, updated. 70524825b6478deeb45eec354fe0192ba23b448b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a34102df4f55808da8c9a6016e1d51e98861f70c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jul 1 11:28:15 2015 +0200

    Fix changelog after merge.
---
 debian/changelog | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f93101f..db3d1ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,12 +7,6 @@ kwin (4:5.3.2-1~) UNRELEASED; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:20:39 +0200
 
-kwin (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 19:34:37 +0200
-
 kwin (4:5.3.1-0ubuntu3) wily; urgency=medium
 
   * No-change rebuild against Qt 5.4.2.
@@ -38,8 +32,8 @@ kwin (4:5.3.1-0ubuntu1) wily; urgency=medium
 
 kwin (4:5.2.2a-0ubuntu1) vivid; urgency=medium
 
-  * New upstream release 
-  * New upstream tar. 
+  * New upstream release
+  * New upstream tar.
   * Append a to version so launchpad accepts new tar.
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:33:08 -0700
@@ -55,8 +49,8 @@ kwin (4:5.2.2-1) experimental; urgency=medium
 
 kwin (4:5.2.1-0ubuntu1) vivid; urgency=medium
 
-  * New upstream release 
-  * Batchpatch symbols file. 
+  * New upstream release
+  * Batchpatch symbols file.
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:42:26 -0800
 

-- 
kwin packaging