[SCM] marble packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-60-g573b5ad

[Harald Sitter]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 573b5add04485f2daa2b7e0ed485854324481b27
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Aug 31 14:49:35 2015 +0200

    Renable patches previously disabled in kf5 port
    
    * Renable patches previously disabled in kf5 port
      + fix_qmake_fallback.diff
      + do_not_install_private_headers
      + kubuntu_disable-MarbleRunnerManagerTest.diff
---
 debian/changelog                                            |  9 +++++++++
 debian/patches/do_not_install_private_headers               | 10 +++++-----
 debian/patches/kubuntu_disable-MarbleRunnerManagerTest.diff | 10 +++++-----
 debian/patches/series                                       |  6 +++---
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ec8816..9a84e3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+marble (4:15.08.0-0ubuntu4) wily; urgency=medium
+
+  * Renable patches previously disabled in kf5 port
+    + fix_qmake_fallback.diff
+    + do_not_install_private_headers
+    + kubuntu_disable-MarbleRunnerManagerTest.diff
+
+ -- Harald Sitter <sitter at kde.org>  Mon, 31 Aug 2015 14:33:06 +0200
+
 marble (4:15.08.0-0ubuntu3) wily; urgency=medium
 
   * Update symbols
diff --git a/debian/patches/do_not_install_private_headers b/debian/patches/do_not_install_private_headers
index 17dd6a2..004fc3b 100644
--- a/debian/patches/do_not_install_private_headers
+++ b/debian/patches/do_not_install_private_headers
@@ -1,16 +1,16 @@
 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
++++ marble/src/lib/marble/CMakeLists.txt
+@@ -495,7 +495,6 @@ install( FILES
      MarbleInputHandler.h
      MarbleWidgetInputHandler.h
      MarbleWidgetPopupMenu.h
 -    TileId.h
      TileCoordsPyramid.h
      TileLevelRangeWidget.h
-     TinyWebBrowser.h
-@@ -518,10 +517,8 @@
+     QtMarbleConfigDialog.h
+@@ -577,10 +576,8 @@ install( FILES
      ParsingRunner.h
      SearchRunner.h
      ReverseGeocodingRunner.h
diff --git a/debian/patches/kubuntu_disable-MarbleRunnerManagerTest.diff b/debian/patches/kubuntu_disable-MarbleRunnerManagerTest.diff
index a082447..fd64f85 100644
--- a/debian/patches/kubuntu_disable-MarbleRunnerManagerTest.diff
+++ b/debian/patches/kubuntu_disable-MarbleRunnerManagerTest.diff
@@ -1,15 +1,15 @@
 Description: disable failing test
 Author: doko
 Origin: ubuntu
-Forwarded: no, upstream wants to keep the best but says it doesn't always work
+Forwarded: no, upstream wants to keep the test 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
+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
++++ marble/tests/CMakeLists.txt
+@@ -65,7 +65,9 @@ marble_add_test( QuaternionTest )
  marble_add_test( TileIdTest )               # Check TileId arithmetic
  marble_add_test( ViewportParamsTest )
  marble_add_test( PluginManagerTest )        # Check plugin loading
diff --git a/debian/patches/series b/debian/patches/series
index 9dbb854..b5697b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-#fix_qmake_fallback.diff
-#do_not_install_private_headers
-#kubuntu_disable-MarbleRunnerManagerTest.diff
+fix_qmake_fallback.diff
+do_not_install_private_headers
+kubuntu_disable-MarbleRunnerManagerTest.diff
 upstream_fix-vtable-linking.diff

-- 
marble packaging