Bug#688776: unblock: marble/4:4.8.4-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider pre-approving the unblock for marble.
- fixes a FTBFS that happen in an enviroment with QML stuff installed,
e.g. the various libqt4-declarative-* (#688755), fixing also their
installation path to the proper place
- removes files not usable in Debian (due to lack of packaged
dependencies)
- suggests in marble the packages for the different local routing
services it can use (#677058)
unblock marble/4:4.8.4-3
Thanks,
--
Pino
diff -Nru marble-4.8.4/debian/changelog marble-4.8.4/debian/changelog
--- marble-4.8.4/debian/changelog 2012-06-21 22:20:10.000000000 +0200
+++ marble-4.8.4/debian/changelog 2012-09-25 17:33:16.000000000 +0200
@@ -1,3 +1,15 @@
+marble (4:4.8.4-3) unstable; urgency=low
+
+ * Team upload.
+ * Fix the detection of the QML imports directory, and move the QML stuff
+ accordingly; patch fix_qmake_fallback.diff. (Closes: #688755)
+ * Do not install marble-touch and its qtcomponents, since they require
+ libraries not available in Debian.
+ * Add in marble suggests for the various routing services: libqt4-sql-sqlite,
+ gosmore, monav-routing-daemon, routino. (Closes: #677058)
+
+ -- Pino Toscano <pino@debian.org> Tue, 25 Sep 2012 17:30:22 +0200
+
marble (4:4.8.4-2) unstable; urgency=low
* Push to unstable
diff -Nru marble-4.8.4/debian/control marble-4.8.4/debian/control
--- marble-4.8.4/debian/control 2012-06-16 23:06:53.000000000 +0200
+++ marble-4.8.4/debian/control 2012-09-25 17:16:33.000000000 +0200
@@ -23,6 +23,7 @@
Section: misc
Depends: ${shlibs:Depends}, ${misc:Depends}, marble-data (>= ${source:Version}),
marble-plugins (= ${binary:Version})
+Suggests: libqt4-sql-sqlite, gosmore, monav-routing-daemon, routino
Description: globe and map widget
Marble is a generic geographical map widget and framework for KDE
applications. The Marble widget shows the earth as a sphere but does not
diff -Nru marble-4.8.4/debian/marble.install marble-4.8.4/debian/marble.install
--- marble-4.8.4/debian/marble.install 2012-06-16 22:45:10.000000000 +0200
+++ marble-4.8.4/debian/marble.install 2012-09-25 16:51:29.000000000 +0200
@@ -1,5 +1,4 @@
usr/bin/marble
-usr/bin/marble-touch
usr/bin/routing-instructions
usr/bin/tilecreator
usr/lib/kde4/libmarble_part.so
diff -Nru marble-4.8.4/debian/marble-plugins.install marble-4.8.4/debian/marble-plugins.install
--- marble-4.8.4/debian/marble-plugins.install 2012-06-16 22:44:25.000000000 +0200
+++ marble-4.8.4/debian/marble-plugins.install 2012-09-25 16:50:31.000000000 +0200
@@ -1,3 +1,6 @@
+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/kde4/plugins/marble/13/AprsPlugin.so
usr/lib/kde4/plugins/marble/13/CachePlugin.so
usr/lib/kde4/plugins/marble/13/CompassFloatItem.so
@@ -37,17 +40,3 @@
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 -Nru marble-4.8.4/debian/not-installed marble-4.8.4/debian/not-installed
--- marble-4.8.4/debian/not-installed 2012-06-16 14:14:11.000000000 +0200
+++ marble-4.8.4/debian/not-installed 2012-09-25 16:51:37.000000000 +0200
@@ -1,2 +1,16 @@
# extra license file
./usr/share/kde4/apps/marble/data/LICENSE.txt
+
+# marble-touch
+./usr/bin/marble-touch
+./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
diff -Nru marble-4.8.4/debian/patches/fix_qmake_fallback.diff marble-4.8.4/debian/patches/fix_qmake_fallback.diff
--- marble-4.8.4/debian/patches/fix_qmake_fallback.diff 1970-01-01 01:00:00.000000000 +0100
+++ marble-4.8.4/debian/patches/fix_qmake_fallback.diff 2012-09-25 16:40:13.000000000 +0200
@@ -0,0 +1,19 @@
+Author: Pino Toscano <pino@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 -Nru marble-4.8.4/debian/patches/series marble-4.8.4/debian/patches/series
--- marble-4.8.4/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ marble-4.8.4/debian/patches/series 2012-09-25 16:36:45.000000000 +0200
@@ -0,0 +1 @@
+fix_qmake_fallback.diff
Reply to: