[SCM] marble packaging branch, kubuntu_unstable, updated. ubuntu/4%15.08.2-0ubuntu1-24-ga899f38

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable branch:
commit a899f3844a83e9de6d1611f73ddf441e53e6904c
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Oct 30 14:00:15 2015 +0000

    refresh patches
---
 debian/patches/do_not_install_private_headers | 4 ++--
 debian/patches/fix_qmake_fallback.diff        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/do_not_install_private_headers b/debian/patches/do_not_install_private_headers
index 004fc3b..530e76f 100644
--- a/debian/patches/do_not_install_private_headers
+++ b/debian/patches/do_not_install_private_headers
@@ -2,7 +2,7 @@ Index: marble/src/lib/marble/CMakeLists.txt
 ===================================================================
 --- marble.orig/src/lib/marble/CMakeLists.txt
 +++ marble/src/lib/marble/CMakeLists.txt
-@@ -495,7 +495,6 @@ install( FILES
+@@ -469,7 +469,6 @@ install( FILES
      MarbleInputHandler.h
      MarbleWidgetInputHandler.h
      MarbleWidgetPopupMenu.h
@@ -10,7 +10,7 @@ Index: marble/src/lib/marble/CMakeLists.txt
      TileCoordsPyramid.h
      TileLevelRangeWidget.h
      QtMarbleConfigDialog.h
-@@ -577,10 +576,8 @@ install( FILES
+@@ -551,10 +550,8 @@ install( FILES
      ParsingRunner.h
      SearchRunner.h
      ReverseGeocodingRunner.h
diff --git a/debian/patches/fix_qmake_fallback.diff b/debian/patches/fix_qmake_fallback.diff
index e8a0986..ed2a610 100644
--- a/debian/patches/fix_qmake_fallback.diff
+++ b/debian/patches/fix_qmake_fallback.diff
@@ -8,9 +8,9 @@ Forwarded: no
 
 Index: marble/src/CMakeLists.txt
 ===================================================================
---- marble.orig/src/CMakeLists.txt	2014-08-20 21:03:46.646897871 +0200
-+++ marble/src/CMakeLists.txt	2014-08-20 21:03:46.646897871 +0200
-@@ -9,7 +9,7 @@
+--- marble.orig/src/CMakeLists.txt
++++ marble/src/CMakeLists.txt
+@@ -9,7 +9,7 @@ endif(BUILD_WITH_DBUS)
  
  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")
@@ -18,4 +18,4 @@ Index: marble/src/CMakeLists.txt
 +  IF(DEFINED QT_IMPORTS_DIR AND QT_IMPORTS_DIR)
      SET(MARBLE_QT_IMPORTS_DIR ${QT_IMPORTS_DIR})
    ELSE()
-     # Fallback when FindQt4.cmake (part of cmake) does not define QT_IMPORTS_DIR. Get it from qmake instead.
+     # Fallback when FindQt.cmake (part of cmake) does not define QT_IMPORTS_DIR. Get it from qmake instead.

-- 
marble packaging