[SCM] marble packaging branch, master, updated. debian/4.13.3-2-8-ga864877

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7d3b311b3ec85590514a0f861cf58c23ef13d22c
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Aug 22 04:28:27 2014 +0200

    Reenable the do_not_install_private_headers patch.
---
 debian/changelog                              |  1 +
 debian/patches/do_not_install_private_headers | 25 ++++++++-----------------
 debian/patches/series                         |  2 +-
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36b3805..ffa49e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ marble (4:4.14.0-1~) UNRELEASED; urgency=medium
   * Remove upstream patch: upstream_revert-fix-loading-of-relative-
     local-resources-in-popup-dialog.patch
   * Update libmarblewidget soversion to 19.
+  * Reenable the do_not_install_private_headers patch.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 20 Aug 2014 21:08:50 +0200
 
diff --git a/debian/patches/do_not_install_private_headers b/debian/patches/do_not_install_private_headers
index 6531afb..17dd6a2 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-20 21:03:48.326829715 +0200
-+++ marble/src/lib/marble/CMakeLists.txt	2014-08-20 21:03:48.322829876 +0200
-@@ -436,11 +436,9 @@
+--- 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 @@
      MarbleInputHandler.h
      MarbleWidgetInputHandler.h
      MarbleWidgetPopupMenu.h
@@ -10,20 +10,11 @@ Index: marble/src/lib/marble/CMakeLists.txt
      TileCoordsPyramid.h
      TileLevelRangeWidget.h
      TinyWebBrowser.h
--    QtMarbleConfigDialog.h
-     global.h
-     MarbleColors.h
-     MarbleGlobal.h
-@@ -467,7 +465,6 @@
-     geodata/data/GeoDataFeature.h
-     geodata/data/GeoDataFolder.h
-     geodata/data/GeoDataGeometry.h
--    geodata/data/GeoDataGroundOverlay.h
-     geodata/data/GeoDataHotSpot.h
-     geodata/data/GeoDataIconStyle.h
-     geodata/data/GeoDataItemIcon.h
-@@ -521,7 +518,6 @@
-     RoutingRunner.h
+@@ -518,10 +517,8 @@
+     ParsingRunner.h
+     SearchRunner.h
+     ReverseGeocodingRunner.h
+-    RoutingRunner.h
      SearchRunnerPlugin.h
      ReverseGeocodingRunnerPlugin.h
 -    RoutingRunnerPlugin.h
diff --git a/debian/patches/series b/debian/patches/series
index b4b6e11..a2ff3c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 fix_qmake_fallback.diff
-# do_not_install_private_headers
+do_not_install_private_headers

-- 
marble packaging