[SCM] marble packaging branch, master, updated. debian/4.14.2-1-39-g7f40cfd

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b314ecf147ba09c6936f4c01534a6a2872ce32e0
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jun 12 17:17:12 2015 +0200

    Refresh patches
---
 debian/changelog                                    | 1 +
 debian/patches/disable-MarbleRunnerManagerTest.diff | 8 ++++----
 debian/patches/do_not_install_private_headers       | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d16243f..0ffce75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ marble (4:15.04.2+dfsg-1~) UNRELEASED; urgency=medium
   * New upstream release (15.04.2).
   * Update copyright information.
   * Prune CC-BY-SA-2.0 licensed files, (not dfsg compatible license).
+  * Refresh patches
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Jun 2015 16:35:36 +0200
 
diff --git a/debian/patches/disable-MarbleRunnerManagerTest.diff b/debian/patches/disable-MarbleRunnerManagerTest.diff
index b5fa3dc..d229857 100644
--- a/debian/patches/disable-MarbleRunnerManagerTest.diff
+++ b/debian/patches/disable-MarbleRunnerManagerTest.diff
@@ -1,8 +1,8 @@
-Index: b/tests/CMakeLists.txt
+Index: marble/tests/CMakeLists.txt
 ===================================================================
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -73,7 +73,9 @@ marble_add_test( QuaternionTest )
+--- marble.orig/tests/CMakeLists.txt	2015-06-12 17:16:33.022233088 +0200
++++ marble/tests/CMakeLists.txt	2015-06-12 17:16:33.018233248 +0200
+@@ -74,7 +74,9 @@
  marble_add_test( TileIdTest )               # Check TileId arithmetic
  marble_add_test( ViewportParamsTest )
  marble_add_test( PluginManagerTest )        # Check plugin loading
diff --git a/debian/patches/do_not_install_private_headers b/debian/patches/do_not_install_private_headers
index 17dd6a2..4cbf8cd 100644
--- a/debian/patches/do_not_install_private_headers
+++ b/debian/patches/do_not_install_private_headers
@@ -1,8 +1,8 @@
 Index: marble/src/lib/marble/CMakeLists.txt
 ===================================================================
---- marble.orig/src/lib/marble/CMakeLists.txt	2014-08-22 04:20:15.444106317 +0200
-+++ marble/src/lib/marble/CMakeLists.txt	2014-08-22 04:23:49.603482876 +0200
-@@ -436,7 +436,6 @@
+--- marble.orig/src/lib/marble/CMakeLists.txt	2015-06-12 17:20:38.048494600 +0200
++++ marble/src/lib/marble/CMakeLists.txt	2015-06-12 17:20:38.044494760 +0200
+@@ -472,7 +472,6 @@
      MarbleInputHandler.h
      MarbleWidgetInputHandler.h
      MarbleWidgetPopupMenu.h
@@ -10,7 +10,7 @@ Index: marble/src/lib/marble/CMakeLists.txt
      TileCoordsPyramid.h
      TileLevelRangeWidget.h
      TinyWebBrowser.h
-@@ -518,10 +517,8 @@
+@@ -554,10 +553,8 @@
      ParsingRunner.h
      SearchRunner.h
      ReverseGeocodingRunner.h

-- 
marble packaging