[SCM] kwindowsystem packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-15-gd314056

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 47694e8dc76989608d17b9056867dde150bf577e
Merge: 6a259301ce8cad1cd243d7c4a614f4a6ec56a9f4 e8cf407434308f3cb37e11b40027f4f08ccc8666
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:46:56 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control
    	debian/patches/series

 debian/changelog                              |  9 ++++++++
 debian/control                                |  2 +-
 debian/patches/kubuntu_skip-failed-tests.diff | 31 ---------------------------
 debian/patches/series                         |  1 -
 4 files changed, 10 insertions(+), 33 deletions(-)

diff --cc debian/changelog
index c3537f2,c59e42a..d3cc3c4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,12 +1,37 @@@
+ kwindowsystem (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * Update symbols files from buildds logs (5.9.0-1).
+   * Update symbols files.
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 13:45:08 +0200
+ 
 +kwindowsystem (5.10.0-0ubuntu3) wily; urgency=medium
 +
 +  * Add kubuntu_skip-failed-tests.diff to get it into the archive
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 22 Jun 2015 23:01:00 +0200
 +
 +kwindowsystem (5.10.0-0ubuntu2) wily; urgency=medium
 +
 +  * Disable test_depends_on_stack_pointer, keep it around incase the
 +    tests fail again
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 15 Jun 2015 06:39:32 +0200
 +
 +kwindowsystem (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +  * Update symbols files from buildds logs (5.9.0-1).
 +  * Update symbols files.
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:43:32 +0200
 +
  kwindowsystem (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).
diff --cc debian/patches/series
index 363468c,e69de29..0000000
deleted file mode 100644,100644
--- a/debian/patches/series
+++ /dev/null

-- 
kwindowsystem packaging