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

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 5cb85f7f46b9a66d1ef60508342bf9515bb1fbe1
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Nov 3 17:51:21 2015 -0800

    Refresh fix_qmake_fallback.diff patch.
---
 debian/changelog                       | 4 ++++
 debian/patches/fix_qmake_fallback.diff | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index faa86ec..cad234c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 marble (4:15.11.80-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Jonathan Riddell ]
   * Build with MARBLE_INSTALL_ANDROID_APPS
 
+  [ Scarlett Clark ]
+  * Refresh fix_qmake_fallback.diff patch. 
+
  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 14 Sep 2015 13:20:57 +0100
 
 marble (4:15.08.2-0ubuntu1) wily; urgency=medium
diff --git a/debian/patches/fix_qmake_fallback.diff b/debian/patches/fix_qmake_fallback.diff
index ed2a610..7c32858 100644
--- a/debian/patches/fix_qmake_fallback.diff
+++ b/debian/patches/fix_qmake_fallback.diff
@@ -14,8 +14,8 @@ Index: marble/src/CMakeLists.txt
  
  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)
+-  IF(QT_IMPORTS_DIR)
++  IF(QT_IMPORTS_DIR AND QT_IMPORTS_DIR)
      SET(MARBLE_QT_IMPORTS_DIR ${QT_IMPORTS_DIR})
    ELSE()
      # Fallback when FindQt.cmake (part of cmake) does not define QT_IMPORTS_DIR. Get it from qmake instead.

-- 
marble packaging