[SCM] marble packaging branch, master, updated. debian/15.08.3-1-17-g49ec09e

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 1976c051b02a773024290eece5b46a822726a13b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jan 20 21:24:20 2016 +0100

    Drop patch: fix_qmake_fallback.diff
---
 debian/changelog                       |  1 +
 debian/patches/fix_qmake_fallback.diff | 21 ---------------------
 debian/patches/series                  |  1 -
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 120454b..7954850 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ marble (4:15.12.0-1~) UNRELEASED; urgency=medium
   * New upstream release (15.12.0).
   * Change libquazip-qt5-dev build dep to libquazip5-dev. (Closes:
     #811203) Thanks to Sebastiaan Couwenberg.
+  * Drop patch: fix_qmake_fallback.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Dec 2015 16:15:07 +0100
 
diff --git a/debian/patches/fix_qmake_fallback.diff b/debian/patches/fix_qmake_fallback.diff
deleted file mode 100644
index e8a0986..0000000
--- a/debian/patches/fix_qmake_fallback.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Fallback to qmake also when QT_IMPORTS_DIR is "not found".
- If FindQt4.cmake cannot detect the QML imports dir (e.g. because it is
- missing), then QT_IMPORTS_DIR is defined but in a "not found" state.
- Also in such case, fallback to qmake to detect it.
-Last-Update: 2012-09-25
-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 @@
- 
- 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)
-     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.
diff --git a/debian/patches/series b/debian/patches/series
index 201f2fc..7dd9bcf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-fix_qmake_fallback.diff
 do_not_install_private_headers
 kubuntu_disable-MarbleRunnerManagerTest.diff

-- 
marble packaging