[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=db5b298

The following commit has been merged in the master branch:
commit db5b2985e8df657b36df0dcf254656fd91ced47e
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed May 21 17:33:14 2014 +0200

    Refresh patches.
---
 debian/changelog                              |  1 +
 debian/patches/do_not_install_private_headers | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 691f684..96a4208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ marble (4:4.13.1-1) UNRELEASED; urgency=medium
   * Split marble, new bin:marble-qt.
   * New library package, libastro1, and -dev.
   * Update libmarblewidget soversion to 18.
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 21 May 2014 10:54:02 +0200
 
diff --git a/debian/patches/do_not_install_private_headers b/debian/patches/do_not_install_private_headers
index 8a8e4c6..a375214 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-02-07 16:44:30.936152397 +0100
-+++ marble/src/lib/marble/CMakeLists.txt	2014-02-07 18:54:47.352802174 +0100
-@@ -396,7 +396,6 @@
+--- 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 @@
      MarbleAboutDialog.h
      MarbleWidgetInputHandler.h
      MarbleWidgetPopupMenu.h
@@ -10,7 +10,7 @@ Index: marble/src/lib/marble/CMakeLists.txt
      TileCoordsPyramid.h
      TileLevelRangeWidget.h
      TinyWebBrowser.h
-@@ -426,7 +425,6 @@
+@@ -447,7 +446,6 @@
      geodata/data/GeoDataFeature.h
      geodata/data/GeoDataFolder.h
      geodata/data/GeoDataGeometry.h
@@ -18,7 +18,7 @@ Index: marble/src/lib/marble/CMakeLists.txt
      geodata/data/GeoDataHotSpot.h
      geodata/data/GeoDataIconStyle.h
      geodata/data/GeoDataItemIcon.h
-@@ -478,7 +476,6 @@
+@@ -501,7 +499,6 @@
      RoutingRunner.h
      SearchRunnerPlugin.h
      ReverseGeocodingRunnerPlugin.h

-- 
marble packaging