[SCM] kwayland packaging branch, master, updated. debian/4%5.37.0-2-118-ge964566

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8ddfe3524df368915d37c6e3de080d6eae064de3
Merge: 35e8a83eb65a73dc6fddab03efb4afdecf2a8730 7028ec1fda5f65c8d1ac7ac4741028569ddb7984
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Jul 13 11:57:38 2015 +0000

    Merging remotes/origin/kubuntu_wily_archive into kubuntu_stable.

 debian/.gitattributes                            |  1 -
 debian/changelog                                 |  6 ++++++
 debian/patches/kubuntu_disable-failing-test.diff | 22 ++++++++++++++++++++++
 debian/patches/series                            |  1 +
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 7e4590d,096ca95..680f2b4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ kwayland (4:5.3.2-0ubuntu2) wily; urgency=medium
+ 
+   * Add kubuntu_disable-failing-test.diff to disable failing tests
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 13 Jul 2015 13:56:13 +0200
+ 
 +kwayland (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Vivid backport
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 02 Jul 2015 11:40:12 -0700
 +
  kwayland (4:5.3.2-0ubuntu1) wily; urgency=medium
  
    * New upstream release

-- 
kwayland packaging