[SCM] marble packaging branch, master, updated. debian/15.08.3-1-42-g049ab6f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8229d243105e0787c4ce931e0d432fb000a74155
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Thu Apr 14 05:52:15 2016 +0200

    Refresh patches
---
 debian/patches/do_not_install_private_headers      | 19 +++++++++++++-----
 .../kubuntu_disable-MarbleRunnerManagerTest.diff   | 23 +++++++++++-----------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/debian/patches/do_not_install_private_headers b/debian/patches/do_not_install_private_headers
index 4354eca..629cc00 100644
--- a/debian/patches/do_not_install_private_headers
+++ b/debian/patches/do_not_install_private_headers
@@ -1,8 +1,17 @@
-Index: marble/src/lib/marble/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 14 Apr 2016 05:52:13 +0200
+Subject: do_not_install_private_headers
+
 ===================================================================
---- marble.orig/src/lib/marble/CMakeLists.txt	2016-01-20 21:25:04.783396432 +0100
-+++ marble/src/lib/marble/CMakeLists.txt	2016-01-20 21:25:04.779396600 +0100
-@@ -469,7 +469,6 @@
+---
+ src/lib/marble/CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
+index 42fe56f..8d81e57 100644
+--- a/src/lib/marble/CMakeLists.txt
++++ b/src/lib/marble/CMakeLists.txt
+@@ -469,7 +469,6 @@ install( FILES
      MarbleInputHandler.h
      MarbleWidgetInputHandler.h
      MarbleWidgetPopupMenu.h
@@ -10,7 +19,7 @@ Index: marble/src/lib/marble/CMakeLists.txt
      TileCoordsPyramid.h
      TileLevelRangeWidget.h
      QtMarbleConfigDialog.h
-@@ -551,10 +550,8 @@
+@@ -551,10 +550,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 fd64f85..1a03389 100644
--- a/debian/patches/kubuntu_disable-MarbleRunnerManagerTest.diff
+++ b/debian/patches/kubuntu_disable-MarbleRunnerManagerTest.diff
@@ -1,15 +1,16 @@
-Description: disable failing test
-Author: doko
-Origin: ubuntu
-Forwarded: no, upstream wants to keep the test but says it doesn't always work
-Last-Update: 2015-03-17
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 14 Apr 2016 05:52:13 +0200
+Subject: kubuntu_disable-MarbleRunnerManagerTest
+
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: marble/tests/CMakeLists.txt
-===================================================================
---- marble.orig/tests/CMakeLists.txt
-+++ marble/tests/CMakeLists.txt
-@@ -65,7 +65,9 @@ marble_add_test( QuaternionTest )
+ tests/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index d0db4d6..37a9e6e 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -65,7 +65,9 @@ marble_add_test( QuaternionTest )           # Check Quaternion arithmetic
  marble_add_test( TileIdTest )               # Check TileId arithmetic
  marble_add_test( ViewportParamsTest )
  marble_add_test( PluginManagerTest )        # Check plugin loading

-- 
marble packaging