[SCM] kwindowsystem packaging branch, master, updated. debian/5.6.0-1-31-g2324008

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwindowsystem.git;a=commitdiff;h=f545210

The following commit has been merged in the master branch:
commit f545210e334b8763f6b43934b4bda57a8894389b
Merge: 81b9e52e1701c5d0d2508d156bcc046129250945 6d31358daf8067bb056ca3d09d89ecd8fc7afa26
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 4 11:18:43 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control
    	debian/copyright
    	debian/libkf5windowsystem5.symbols

 debian/changelog                   | 42 ++++++++++++++++++++++++++++++++++++++
 debian/control                     |  2 +-
 debian/libkf5windowsystem5.symbols |  3 ++-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index aa7de64,66123ed..1f26b44
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,45 +1,67 @@@
 +kwindowsystem (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:35:30 +0100
 +
+ kwindowsystem (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:18:04 +0100
+ 
 +kwindowsystem (5.6.0-1) experimental; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * Do not build depend on qt5-default, we only need qtbase5-dev
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.6.0).
 +  * Bump build dependencies to build against the experimental versions.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update install files.
 +  * Update build dependencies to follow cmake.
 +  * Update copyright information.
 +  * Add acc autopkgtests.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 24 Jan 2015 17:25:17 +0100
 +
+ kwindowsystem (5.6.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 06 Jan 2015 19:48:01 +0100
+ 
+ kwindowsystem (5.5.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 11:15:52 +0100
+ 
+ kwindowsystem (5.4.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Nov 2014 15:05:44 +0100
+ 
+ kwindowsystem (5.3.0-0ubuntu2) utopic; urgency=medium
+ 
+   * Add upstream_fix-incorrect-count-of-netwm-atoms.diff fix i386 apps
+     from "stack smashing detected"
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 10 Oct 2014 17:01:15 +0200
+ 
+ kwindowsystem (5.3.0-0ubuntu1) utopic; urgency=medium
+ 
+   [ Harald Sitter ]
+   * Do not build depend on qt5-default, we only need qtbase5-dev
+ 
+   [ Jonathan Riddell ]
+   * 5.3 snapshot needed by kwin
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 Oct 2014 11:15:07 +0100
+ 
  kwindowsystem (5.2.0-0ubuntu1) utopic; urgency=medium
  
    [ Jonathan Riddell ]
diff --cc debian/control
index 323307d,6a0469c..d204315
--- a/debian/control
+++ b/debian/control
@@@ -3,9 -3,9 +3,9 @@@ Section: lib
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
+                extra-cmake-modules (>= 1.7.0),
                 libqt5x11extras5-dev,
                 libxcb-keysyms1-dev,
                 libxcb-xfixes0-dev,

-- 
kwindowsystem packaging