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

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 385a20d500cb2c872a708148e29302bd523344a6
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jul 13 13:38:36 2015 +0200

    Add kubuntu_disable-test.diff to disable failing test
---
 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 --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 dfebcb8..75e4a0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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) wily; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/kubuntu_disable-test.diff b/debian/patches/kubuntu_disable-test.diff
new file mode 100644
index 0000000..b89abd9
--- /dev/null
+++ b/debian/patches/kubuntu_disable-test.diff
@@ -0,0 +1,12 @@
+Index: kscreen-5.3.2/tests/kded/CMakeLists.txt
+===================================================================
+--- kscreen-5.3.2.orig/tests/kded/CMakeLists.txt
++++ kscreen-5.3.2/tests/kded/CMakeLists.txt
+@@ -25,6 +25,6 @@ macro(ADD_KDED_TEST testname)
+     ecm_mark_as_test(${testname})
+ endmacro()
+ 
+-add_kded_test(testgenerator)
++#add_kded_test(testgenerator)
+ add_kded_test(serializertest)
+ #add_kded_test(testdaemon)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1bbe8f1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_disable-test.diff

-- 
kscreen packaging