[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=2650aff

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

    Make kubuntu_disable-MarbleRunnerManagerTest.diff apply with policy
---
 debian/changelog                                                   | 6 ++++++
 ...nagerTest.diff => kubuntu_disable-MarbleRunnerManagerTest.diff} | 7 +++++++
 debian/patches/series                                              | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c182df3..81e60be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+marble (4:14.12.3-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Make kubuntu_disable-MarbleRunnerManagerTest.diff apply with policy
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 12:29:01 +0100
+
 marble (4:14.12.3-0ubuntu2) vivid; urgency=medium
 
   * Disable running the MarbleRunnerManagerTest test. Upstream says
diff --git a/debian/patches/disable-MarbleRunnerManagerTest.diff b/debian/patches/kubuntu_disable-MarbleRunnerManagerTest.diff
similarity index 76%
rename from debian/patches/disable-MarbleRunnerManagerTest.diff
rename to debian/patches/kubuntu_disable-MarbleRunnerManagerTest.diff
index b5fa3dc..a082447 100644
--- a/debian/patches/disable-MarbleRunnerManagerTest.diff
+++ b/debian/patches/kubuntu_disable-MarbleRunnerManagerTest.diff
@@ -1,3 +1,10 @@
+Description: disable failing test
+Author: doko
+Origin: ubuntu
+Forwarded: no, upstream wants to keep the best but says it doesn't always work
+Last-Update: 2015-03-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: b/tests/CMakeLists.txt
 ===================================================================
 --- a/tests/CMakeLists.txt
diff --git a/debian/patches/series b/debian/patches/series
index 4dd8fd0..201f2fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 fix_qmake_fallback.diff
 do_not_install_private_headers
-disable-MarbleRunnerManagerTest.diff
+kubuntu_disable-MarbleRunnerManagerTest.diff

-- 
marble packaging