[SCM] marble packaging branch, kde4.12, updated. debian/4.11.5+dfsg-1-6-gd1aed03

[Maximiliano Curia]

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

The following commit has been merged in the kde4.12 branch:
commit 1c387e1ab98cc0e065b74f3718481742bea7bb16
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Feb 7 16:17:48 2014 +0100

    Refresh patches and update do_not_install_private_headers
---
 debian/changelog                              |  2 ++
 debian/patches/do_not_install_private_headers | 18 +++++++++++++-----
 debian/patches/fix_qmake_fallback.diff        |  6 +++---
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43c4034..cbf7a97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 marble (4:4.12.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches.
+  * Update: do_not_install_private_headers.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 05 Feb 2014 00:16:11 +0100
 
diff --git a/debian/patches/do_not_install_private_headers b/debian/patches/do_not_install_private_headers
index 725c63b..8a8e4c6 100644
--- a/debian/patches/do_not_install_private_headers
+++ b/debian/patches/do_not_install_private_headers
@@ -1,8 +1,16 @@
-Index: marble/src/lib/CMakeLists.txt
+Index: marble/src/lib/marble/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 @@
+--- 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 @@
+     MarbleAboutDialog.h
+     MarbleWidgetInputHandler.h
+     MarbleWidgetPopupMenu.h
+-    TileId.h
+     TileCoordsPyramid.h
+     TileLevelRangeWidget.h
+     TinyWebBrowser.h
+@@ -426,7 +425,6 @@
      geodata/data/GeoDataFeature.h
      geodata/data/GeoDataFolder.h
      geodata/data/GeoDataGeometry.h
@@ -10,7 +18,7 @@ Index: marble/src/lib/CMakeLists.txt
      geodata/data/GeoDataHotSpot.h
      geodata/data/GeoDataIconStyle.h
      geodata/data/GeoDataItemIcon.h
-@@ -432,7 +431,6 @@
+@@ -478,7 +476,6 @@
      RoutingRunner.h
      SearchRunnerPlugin.h
      ReverseGeocodingRunnerPlugin.h
diff --git a/debian/patches/fix_qmake_fallback.diff b/debian/patches/fix_qmake_fallback.diff
index 5a20ee6..48af712 100644
--- a/debian/patches/fix_qmake_fallback.diff
+++ b/debian/patches/fix_qmake_fallback.diff
@@ -8,11 +8,11 @@ Forwarded: no
 
 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
+--- marble.orig/src/CMakeLists.txt	2014-02-07 16:12:19.098716609 +0100
++++ marble/src/CMakeLists.txt	2014-02-07 16:12:19.094716515 +0100
 @@ -9,7 +9,7 @@
  
- if( QT_QTDECLARATIVE_FOUND )
+ if( QT_QTDECLARATIVE_FOUND OR Qt5Quick_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")
 -  IF(DEFINED QT_IMPORTS_DIR)
 +  IF(DEFINED QT_IMPORTS_DIR AND QT_IMPORTS_DIR)

-- 
marble packaging