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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4f20c072d071cfa16df7fd7d0449f1b63ed6809a
Merge: 6f7c6c1033883924afe03e363a0a58239b3bdfae 7942ffcb50ef076b3349e1262262c2afae4b16a6
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jul 1 11:27:00 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_stable'

 debian/changelog            | 37 +++++++++++++++++++++++++++++++++++++
 debian/control              | 11 +++++++++--
 debian/kwin-data.qml-ignore |  6 ++++++
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index d98c08c,acd317f..f93101f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,48 +1,49 @@@
 +kwin (4:5.3.2-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.3.0).
 +  * Update symbols files.
 +  * New upstream release (5.3.1).
 +  * New upstream release (5.3.2).
 +
 + -- 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.
+ 
+  -- Adam Conrad <adconrad at ubuntu.com>  Tue, 16 Jun 2015 00:27:17 -0600
+ 
+ kwin (4:5.3.1-0ubuntu1) wily; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * Manual merge kubuntu_stable.
+ 
+   [ Jonathan Riddell ]
+   * Plasma 5.3 beta
+   * new upstream release
+ 
+   [ Scarlett Clark ]
+   * Vivid backport
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:34:16 +0200
+ 
+ kwin (4:5.2.2a-0ubuntu1) vivid; urgency=medium
+ 
+   * 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
+ 
 -kwin (4:5.3.1-1~) UNRELEASED; urgency=medium
 -
 -  * New upstream release (5.3.0).
 -  * Update symbols files.
 -  * New upstream release (5.3.1).
 -
 - -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:52:39 +0200
 -
  kwin (4:5.2.2-1) experimental; urgency=medium
  
    * New upstream release (5.2.1).

-- 
kwin packaging