[SCM] marble packaging branch, master, updated. debian/4.8.4-2-4-gcf82854

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 55385e3cdab8fee5ae3325bcabee833ed27c5993
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 25 16:43:54 2012 +0200

    fix detection of QML import dir (#688755)
    
    move the QML stuff accordingly
---
 debian/changelog                       |    3 +++
 debian/marble-plugins.install          |   28 ++++++++++++++--------------
 debian/patches/fix_qmake_fallback.diff |   19 +++++++++++++++++++
 debian/patches/series                  |    1 +
 4 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e6f1ea0..3a28a22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 marble (4:4.8.4-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Fix the detection of the QML imports directory, and move the QML stuff
+    accordingly; patch fix_qmake_fallback.diff. (Closes: #688755)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 25 Sep 2012 16:34:27 +0200
 
diff --git a/debian/marble-plugins.install b/debian/marble-plugins.install
index 8817bd1..2e8e3be 100644
--- a/debian/marble-plugins.install
+++ b/debian/marble-plugins.install
@@ -1,3 +1,17 @@
+usr/lib/*/qt4/imports/org/kde/edu/marble/MarbleSettings.qml
+usr/lib/*/qt4/imports/org/kde/edu/marble/libMarbleDeclarativePlugin.so
+usr/lib/*/qt4/imports/org/kde/edu/marble/qmldir
+usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/FileDialog.qml
+usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/FileOpenDialog.qml
+usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/FileSaveDialog.qml
+usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/MenuItemSwitch.qml
+usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/RouteEditor.qml
+usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/RoutingDialog.qml
+usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/SearchField.qml
+usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/SearchResultSelectionDialog.qml
+usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/ViaPointEditor.qml
+usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/libQtComponentsPlugin.so
+usr/lib/*/qt4/imports/org/kde/edu/marble/qtcomponents/qmldir
 usr/lib/kde4/plugins/marble/13/AprsPlugin.so
 usr/lib/kde4/plugins/marble/13/CachePlugin.so
 usr/lib/kde4/plugins/marble/13/CompassFloatItem.so
@@ -37,17 +51,3 @@ usr/lib/kde4/plugins/marble/13/SunPlugin.so
 usr/lib/kde4/plugins/marble/13/Weather.so
 usr/lib/kde4/plugins/marble/13/Wikipedia.so
 usr/lib/kde4/plugins/marble/13/YoursPlugin.so
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/MarbleSettings.qml
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/libMarbleDeclarativePlugin.so
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/qmldir
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/qtcomponents/FileDialog.qml
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/qtcomponents/FileOpenDialog.qml
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/qtcomponents/FileSaveDialog.qml
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/qtcomponents/MenuItemSwitch.qml
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/qtcomponents/RouteEditor.qml
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/qtcomponents/RoutingDialog.qml
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/qtcomponents/SearchField.qml
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/qtcomponents/SearchResultSelectionDialog.qml
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/qtcomponents/ViaPointEditor.qml
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/qtcomponents/libQtComponentsPlugin.so
-usr/lib/kde4/plugins/marble/13/org/kde/edu/marble/qtcomponents/qmldir
diff --git a/debian/patches/fix_qmake_fallback.diff b/debian/patches/fix_qmake_fallback.diff
new file mode 100644
index 0000000..4f3461d
--- /dev/null
+++ b/debian/patches/fix_qmake_fallback.diff
@@ -0,0 +1,19 @@
+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
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -10,7 +10,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")
+-  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
new file mode 100644
index 0000000..e8901c6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_qmake_fallback.diff

-- 
marble packaging