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

The following commit has been merged in the master branch:
commit a7fcaaf2a48f6a92e5eb570a2de0aa22737951e5
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jul 13 16:34:26 2015 +0200

    Add kubuntu_disable-tests.diff to disable failing tests
---
 debian/changelog                          |  6 ++++++
 debian/patches/kubuntu_disable-tests.diff | 22 ++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8c13f63..9aadd01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kwayland (4:5.3.2-1ubuntu2) wily; urgency=medium
+
+  * Add kubuntu_disable-tests.diff to disable failing tests
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 13 Jul 2015 16:32:21 +0200
+
 kwayland (4:5.3.2-1ubuntu1) wily; urgency=medium
 
   * Enable weston in debian/tests/control
diff --git a/debian/patches/kubuntu_disable-tests.diff b/debian/patches/kubuntu_disable-tests.diff
new file mode 100644
index 0000000..0dc8e18
--- /dev/null
+++ b/debian/patches/kubuntu_disable-tests.diff
@@ -0,0 +1,22 @@
+Index: kwayland-5.3.2/autotests/client/CMakeLists.txt
+===================================================================
+--- kwayland-5.3.2.orig/autotests/client/CMakeLists.txt
++++ kwayland-5.3.2/autotests/client/CMakeLists.txt
+@@ -31,8 +31,6 @@ if(Wayland_VERSION VERSION_GREATER "1.4.
+         )
+     add_executable(testWaylandFullscreenShell ${testWaylandFullscreenShell_SRCS})
+     target_link_libraries( testWaylandFullscreenShell Qt5::Test KF5::WaylandClient Wayland::Client)
+-    add_test(kwayland-testWaylandFullscreenShell testWaylandFullscreenShell)
+-    ecm_mark_as_test(testWaylandFullscreenShell)
+ endif()
+ 
+ ########################################################
+@@ -76,8 +74,6 @@ set( testWaylandSeat_SRCS
+     )
+ add_executable(testWaylandSeat ${testWaylandSeat_SRCS})
+ target_link_libraries( testWaylandSeat Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client Wayland::Server)
+-add_test(kwayland-testWaylandSeat testWaylandSeat)
+-ecm_mark_as_test(testWaylandSeat)
+ 
+ ########################################################
+ # Test ShmPool
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f402281
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_disable-tests.diff

-- 
kwayland packaging