[SCM] kscreen packaging branch, master, updated. debian/5.3.2-4-4-g2ee07b5
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Sep 4 12:13:36 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kscreen.git;a=commitdiff;h=911676c
The following commit has been merged in the master branch:
commit 911676c112b44b07ca84080054615b11f85701df
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 9d68aa6..7f52d38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,12 @@ kscreen (4:5.3.2-1) unstable; urgency=medium
-- Maximiliano Curia <maxy at debian.org> Wed, 01 Jul 2015 12:31:53 +0200
+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.1-0ubuntu1) wily; urgency=medium
[ Jonathan Riddell ]
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
More information about the pkg-kde-commits
mailing list