[SCM] marble packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-17-g2650aff

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=a79147a

The following commit has been merged in the kubuntu_vivid_archive branch:
commit a79147a20b3a9f7d162e958cf4e5f1ba818ccfa0
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Mar 17 12:27:34 2015 +0100

    Disable running the MarbleRunnerManagerTest test. Upstream says it is flakey and to be ignored.
---
 debian/changelog                                    |  7 +++++++
 debian/patches/disable-MarbleRunnerManagerTest.diff | 15 +++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 71fee6e..c182df3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+marble (4:14.12.3-0ubuntu2) vivid; urgency=medium
+
+  * Disable running the MarbleRunnerManagerTest test. Upstream says
+    it is flakey and to be ignored.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 16 Mar 2015 18:02:12 +0100
+
 marble (4:14.12.3-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/disable-MarbleRunnerManagerTest.diff b/debian/patches/disable-MarbleRunnerManagerTest.diff
new file mode 100644
index 0000000..b5fa3dc
--- /dev/null
+++ b/debian/patches/disable-MarbleRunnerManagerTest.diff
@@ -0,0 +1,15 @@
+Index: b/tests/CMakeLists.txt
+===================================================================
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -73,7 +73,9 @@ marble_add_test( QuaternionTest )
+ marble_add_test( TileIdTest )               # Check TileId arithmetic
+ marble_add_test( ViewportParamsTest )
+ marble_add_test( PluginManagerTest )        # Check plugin loading
+-marble_add_test( MarbleRunnerManagerTest )  # Check RunnerManager signals
++# disabled
++# Riddell> when I asked marble upstream they said it was flakey and to be ignored
++#marble_add_test( MarbleRunnerManagerTest )  # Check RunnerManager signals
+ marble_add_test( BookmarkManagerTest )
+ marble_add_test( PlacemarkPositionProviderPluginTest )
+ marble_add_test( PositionTrackingTest )
diff --git a/debian/patches/series b/debian/patches/series
index a2ff3c0..4dd8fd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_qmake_fallback.diff
 do_not_install_private_headers
+disable-MarbleRunnerManagerTest.diff

-- 
marble packaging