[SCM] kwin packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%5.5.4-0ubuntu2-3-g54914f1

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwin.git;a=commitdiff;h=6331a75

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 6331a757ca05ab1de6127879a4ef3771cb15feb4
Author: Philip Muškovac <yofel at gmx.net>
Date:   Mon Mar 21 22:15:31 2016 +0100

    Disable wayland autopkgtests
---
 debian/changelog                          |  7 +++++++
 debian/patches/disable_wayland_tests.diff | 19 +++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 992d541..bd56d54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kwin (4:5.5.4-0ubuntu2) xenial; urgency=medium
+
+  * Add disable_wayland_tests.diff to disable the wayland autopkgtests as we
+    don't have the proper configuration for them
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Mon, 21 Mar 2016 22:14:33 +0100
+
 kwin (4:5.5.4-0ubuntu1) xenial; urgency=medium
 
   [ Scarlett Clark ]
diff --git a/debian/patches/disable_wayland_tests.diff b/debian/patches/disable_wayland_tests.diff
new file mode 100644
index 0000000..015bf63
--- /dev/null
+++ b/debian/patches/disable_wayland_tests.diff
@@ -0,0 +1,19 @@
+Description: Disable wayland tests
+ Disable the wayland tests until we have a working autopkgtest setup for them
+Author: Philip Muskovac <yofel at gmx.net>
+
+---
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2016-03-21
+
+--- kwin-5.5.4.orig/autotests/CMakeLists.txt
++++ kwin-5.5.4/autotests/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ add_definitions(-DKWIN_UNIT_TEST)
+ remove_definitions(-DQT_USE_QSTRINGBUILDER)
+-add_subdirectory(wayland)
++#add_subdirectory(wayland)
+ 
+ ########################################################
+ # Test ScreenPaintData
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..e01e20b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_wayland_tests.diff

-- 
kwin packaging