[SCM] kwayland packaging branch, kubuntu_wily_archive, updated. ubuntu/4%5.3.2-0ubuntu1-1-g7028ec1

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwayland.git;a=commitdiff;h=7028ec1

The following commit has been merged in the kubuntu_wily_archive branch:
commit 7028ec1fda5f65c8d1ac7ac4741028569ddb7984
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jul 13 13:57:06 2015 +0200

    Add kubuntu_disable-failing-test.diff to disable failing tests
---
 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 --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index faa8afe..096ca95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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) wily; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/kubuntu_disable-failing-test.diff b/debian/patches/kubuntu_disable-failing-test.diff
new file mode 100644
index 0000000..0dc8e18
--- /dev/null
+++ b/debian/patches/kubuntu_disable-failing-test.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..8004009
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_disable-failing-test.diff

-- 
kwayland packaging