[SCM] marble packaging branch, master, updated. debian/4.12.4-2-12-g837985f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 2a15a89be25d4bde70a97051303b4ab38c1a2db2
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed May 21 18:27:34 2014 +0200

    Remove another private header
---
 debian/patches/do_not_install_private_headers | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/patches/do_not_install_private_headers b/debian/patches/do_not_install_private_headers
index a375214..46af01d 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-05-21 17:32:16.267090304 +0200
-+++ marble/src/lib/marble/CMakeLists.txt	2014-05-21 17:32:16.263090464 +0200
-@@ -417,7 +417,6 @@
+--- marble.orig/src/lib/marble/CMakeLists.txt	2014-05-21 18:25:38.407320940 +0200
++++ marble/src/lib/marble/CMakeLists.txt	2014-05-21 18:26:12.077979025 +0200
+@@ -417,11 +417,9 @@
      MarbleAboutDialog.h
      MarbleWidgetInputHandler.h
      MarbleWidgetPopupMenu.h
@@ -10,7 +10,11 @@ Index: marble/src/lib/marble/CMakeLists.txt
      TileCoordsPyramid.h
      TileLevelRangeWidget.h
      TinyWebBrowser.h
-@@ -447,7 +446,6 @@
+-    QtMarbleConfigDialog.h
+     global.h
+     MarbleColors.h
+     MarbleGlobal.h
+@@ -447,7 +445,6 @@
      geodata/data/GeoDataFeature.h
      geodata/data/GeoDataFolder.h
      geodata/data/GeoDataGeometry.h
@@ -18,7 +22,7 @@ Index: marble/src/lib/marble/CMakeLists.txt
      geodata/data/GeoDataHotSpot.h
      geodata/data/GeoDataIconStyle.h
      geodata/data/GeoDataItemIcon.h
-@@ -501,7 +499,6 @@
+@@ -501,7 +498,6 @@
      RoutingRunner.h
      SearchRunnerPlugin.h
      ReverseGeocodingRunnerPlugin.h

-- 
marble packaging