[SCM] marble packaging branch, master, updated. debian/4.11.5+dfsg-1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e25dbc10c97f098b4770fae1392147887f266762
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jan 29 15:14:40 2014 +0100

    New patch: do_not_install_private_headers
---
 debian/changelog                              |  1 +
 debian/patches/do_not_install_private_headers | 20 ++++++++++++++++++++
 debian/patches/fix_qmake_fallback.diff        |  8 +++++---
 debian/patches/series                         |  1 +
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9caf1e8..375cbbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ marble (4:4.11.5+dfsg-1) UNRELEASED; urgency=low
   * Enable build failures on missing symbols.
   * Add autopkgtests.
   * Add abi-compliance-checker info.
+  * New patch: do_not_install_private_headers
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 29 Jan 2014 14:43:41 +0100
 
diff --git a/debian/patches/do_not_install_private_headers b/debian/patches/do_not_install_private_headers
new file mode 100644
index 0000000..725c63b
--- /dev/null
+++ b/debian/patches/do_not_install_private_headers
@@ -0,0 +1,20 @@
+Index: marble/src/lib/CMakeLists.txt
+===================================================================
+--- marble.orig/src/lib/CMakeLists.txt	2014-01-29 14:54:10.441709347 +0100
++++ marble/src/lib/CMakeLists.txt	2014-01-29 15:13:47.099334823 +0100
+@@ -383,7 +383,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
+@@ -432,7 +431,6 @@
+     RoutingRunner.h
+     SearchRunnerPlugin.h
+     ReverseGeocodingRunnerPlugin.h
+-    RoutingRunnerPlugin.h
+     ParseRunnerPlugin.h
+     LayerInterface.h
+     PluginAboutDialog.h
diff --git a/debian/patches/fix_qmake_fallback.diff b/debian/patches/fix_qmake_fallback.diff
index 4f3461d..5a20ee6 100644
--- a/debian/patches/fix_qmake_fallback.diff
+++ b/debian/patches/fix_qmake_fallback.diff
@@ -6,9 +6,11 @@ Description: Fallback to qmake also when QT_IMPORTS_DIR is "not found".
 Last-Update: 2012-09-25
 Forwarded: no
 
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -10,7 +10,7 @@
+Index: marble/src/CMakeLists.txt
+===================================================================
+--- marble.orig/src/CMakeLists.txt	2014-01-29 15:10:55.471470016 +0100
++++ marble/src/CMakeLists.txt	2014-01-29 15:10:55.467469926 +0100
+@@ -9,7 +9,7 @@
  
  if( QT_QTDECLARATIVE_FOUND )
    OPTION(IGNORE_CMAKE_INSTALL_PREFIX_FOR_DECLARATIVE_PLUGINS "Install Marble Qt Declarative plugins to QT_IMPORTS_DIR even if that is out of the CMAKE_INSTALL_PREFIX")
diff --git a/debian/patches/series b/debian/patches/series
index e8901c6..a2ff3c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_qmake_fallback.diff
+do_not_install_private_headers

-- 
marble packaging