[SCM] kscreen packaging branch, kubuntu_unstable, updated. ubuntu/4%5.3.2-0ubuntu1-3-g2dcd531

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kscreen.git;a=commitdiff;h=2dcd531

The following commit has been merged in the kubuntu_unstable branch:
commit 2dcd531cce6c45397bd94cd1e9bce1b82e28b1b8
Merge: e942a2364eb83b08f4100c0a3b312f12d854fabc 385a20d500cb2c872a708148e29302bd523344a6
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Jul 13 11:39:01 2015 +0000

    Merging remotes/origin/kubuntu_wily_archive into kubuntu_stable.

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

diff --cc debian/changelog
index a1fcff6,75e4a0e..a31f123
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ kscreen (4:5.3.2-0ubuntu2) wily; urgency=medium
+ 
+   * Add kubuntu_disable-test.diff to disable failing test
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 13 Jul 2015 13:37:40 +0200
+ 
 +kscreen (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Vivid backport
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 02 Jul 2015 11:38:42 -0700
 +
  kscreen (4:5.3.2-0ubuntu1) wily; urgency=medium
  
    * New upstream release

-- 
kscreen packaging