[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=e90c26f

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

    Merging kubuntu_stable into kubuntu_unstable.

 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 1726e63,680f2b4..91193e1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,9 +1,29 @@@
 +kwayland (4:5.3.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (5.3.2).
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 12:29:13 +0000
 +
 +unknown (unknown1) unknown; urgency=unknown
 +  * Update symbols files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 22:34:50 +0200
 +
 +kwayland (4:5.3.1-1) unstable; urgency=medium
 +
 +  * New upstream release (5.3.0).
 +kwayland (4:5.3.2-1) unstable; urgency=medium
 +
 +  * New upstream release (5.3.1).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 10:53:37 +0200
 +
+ 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

-- 
kwayland packaging