Updates for KDE/4.9

diff --git a/packaging/debian/marble-plugins.install b/packaging/debian/marble-plugins.install
index 2a43a8f..f93ede9 100644 (file)
--- a/packaging/debian/marble-plugins.install
+++ b/packaging/debian/marble-plugins.install
@@ -1,5 +1,7 @@
+opt/marble/lib/marble/plugins/libCachePlugin.so
 opt/marble/lib/marble/plugins/libCrosshairsPlugin.so
-#opt/marble/lib/marble/plugins/libElevationProfileFloatItem.so
+opt/marble/lib/marble/plugins/libElevationProfileFloatItem.so
+opt/marble/lib/marble/plugins/libElevationProfileMarker.so
 opt/marble/lib/marble/plugins/libGraticulePlugin.so
 opt/marble/lib/marble/plugins/libGpsInfo.so
 opt/marble/lib/marble/plugins/libGpxPlugin.so
@@ -7,10 +9,14 @@ opt/marble/lib/marble/plugins/libInhibitScreensaverPlugin.so
 opt/marble/lib/marble/plugins/libKmlPlugin.so
 opt/marble/lib/marble/plugins/libLocalOsmSearchPlugin.so
 opt/marble/lib/marble/plugins/libLocalDatabasePlugin.so
+opt/marble/lib/marble/plugins/libLogPlugin.so
 opt/marble/lib/marble/plugins/libMaemoPositionProviderPlugin.so
 opt/marble/lib/marble/plugins/libMapScaleFloatItem.so
+opt/marble/lib/marble/plugins/libMapQuestPlugin.so
 opt/marble/lib/marble/plugins/libMonavPlugin.so
-opt/marble/lib/marble/plugins/libNominatimPlugin.so
+opt/marble/lib/marble/plugins/libNominatimReverseGeocodingPlugin.so
+opt/marble/lib/marble/plugins/libNominatimSearchPlugin.so
+opt/marble/lib/marble/plugins/libOSRMPlugin.so
 opt/marble/lib/marble/plugins/libOpenRouteServicePlugin.so
 opt/marble/lib/marble/plugins/libOsmPlugin.so
 opt/marble/lib/marble/plugins/libOverviewMap.so
@@ -20,4 +26,3 @@ opt/marble/lib/marble/plugins/libQNamNetworkPlugin.so
 opt/marble/lib/marble/plugins/libRoutingPlugin.so
 opt/marble/lib/marble/plugins/libSpeedometer.so
 opt/marble/lib/marble/plugins/libStarsPlugin.so
-opt/marble/lib/marble/plugins/libYoursPlugin.so

diff --git a/packaging/debian/marble.install b/packaging/debian/marble.install
index 0fe599b..b7fa368 100644 (file)
--- a/packaging/debian/marble.install
+++ b/packaging/debian/marble.install
@@ -2,7 +2,6 @@ opt/marble/bin/marble
 opt/marble/bin/marble.sh
 usr/share/applications/hildon/marble.desktop
 usr/share/dbus-1/services/marble.service
-usr/share/icons/hicolor/128x128/apps/marble.png
 usr/share/icons/hicolor/64x64/apps/marble.png
 usr/share/icons/hicolor/48x48/apps/marble.png
 usr/share/icons/hicolor/26x26/apps/marble.png

diff --git a/packaging/debian/patches/download-basetiles.diff b/packaging/debian/patches/download-basetiles.diff
index 5e298ec..58ac4f7 100644 (file)
--- a/packaging/debian/patches/download-basetiles.diff
+++ b/packaging/debian/patches/download-basetiles.diff
@@ -1,15 +1,16 @@
 Index: src-fremantle/src/lib/MarbleMap.cpp
 ===================================================================
---- src-fremantle.orig/src/lib/MarbleMap.cpp   2011-12-04 10:51:08.000000000 +0100
-+++ src-fremantle/src/lib/MarbleMap.cpp        2011-12-04 10:51:31.000000000 +0100
-@@ -870,10 +870,9 @@
+--- src-fremantle.orig/src/lib/MarbleMap.cpp   2012-08-12 13:18:09.000000000 +0200
++++ src-fremantle/src/lib/MarbleMap.cpp        2012-08-12 16:01:20.000000000 +0200
+@@ -840,11 +838,9 @@
                      delete tileCreatorDlg;
                  }
  
 -                if ( TileLoader::baseTilesAvailable( *texture ) ) {
 -                    textures.append( texture );
 -                } else {
--                    qWarning() << "Base tiles for" << sourceDir << "not available. Skipping.";
+-                    qWarning() << "Base tiles for" << sourceDir << "not available. Skipping all texture layers.";
+-                    textureLayersOk = false;
 +                textures.append( texture );
 +                if ( !TileLoader::baseTilesAvailable( *texture ) ) {
 +                    qWarning() << "Base tiles for" << sourceDir << "not available.";

diff --git a/packaging/debian/patches/install-lang-files.diff b/packaging/debian/patches/install-lang-files.diff
index 98694fa..af04046 100644 (file)
--- a/packaging/debian/patches/install-lang-files.diff
+++ b/packaging/debian/patches/install-lang-files.diff
@@ -1,8 +1,8 @@
-Index: marble-1.1.90/data/CMakeLists.txt
+Index: src-fremantle/data/CMakeLists.txt
 ===================================================================
---- marble-1.1.90.orig/data/CMakeLists.txt     2011-06-22 18:49:32.000000000 +0200
-+++ marble-1.1.90/data/CMakeLists.txt  2011-06-22 18:49:49.000000000 +0200
-@@ -247,6 +247,11 @@
+--- src-fremantle.orig/data/CMakeLists.txt     2012-08-12 19:36:49.000000000 +0200
++++ src-fremantle/data/CMakeLists.txt  2012-08-12 19:36:50.000000000 +0200
+@@ -252,6 +252,11 @@
      install (FILES placemarks/cityplacemarks.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks)
  endif(MOBILE)
  
@@ -12,5 +12,5 @@ Index: marble-1.1.90/data/CMakeLists.txt
 +DESTINATION ${MARBLE_DATA_INSTALL_PATH}/lang)
 +
  if(NOT APPLE AND NOT WIN32)
-   if(QTONLY)
-     set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/../../usr/share/icons)
+   install (FILES icons/hi64-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/64x64/apps/ RENAME marble.png)
+   install (FILES icons/hi48-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps/ RENAME marble.png)

diff --git a/packaging/debian/patches/install-speakers.diff b/packaging/debian/patches/install-speakers.diff
index 2005614..0ec0a33 100644 (file)
--- a/packaging/debian/patches/install-speakers.diff
+++ b/packaging/debian/patches/install-speakers.diff
@@ -1,11 +1,12 @@
 Index: src-fremantle/data/CMakeLists.txt
 ===================================================================
---- src-fremantle.orig/data/CMakeLists.txt     2011-12-04 16:06:13.000000000 +0100
-+++ src-fremantle/data/CMakeLists.txt  2011-12-04 16:06:37.000000000 +0100
-@@ -367,5 +367,6 @@
+--- src-fremantle.orig/data/CMakeLists.txt     2012-08-12 13:18:44.000000000 +0200
++++ src-fremantle/data/CMakeLists.txt  2012-08-12 19:34:06.000000000 +0200
+@@ -377,6 +377,7 @@
  install (FILES
    ${AUDIO_FILES}
  DESTINATION ${MARBLE_DATA_INSTALL_PATH}/audio)
 +install (DIRECTORY audio/speakers DESTINATION ${MARBLE_DATA_INSTALL_PATH}/audio)
  
- install (FILES migration-warning.txt DESTINATION ${MARBLE_DATA_INSTALL_PATH}/)
+ FILE (GLOB_RECURSE DGML_FILES maps/*.dgml)
+ MARBLE_ADD_PROJECT_RESOURCES(${DGML_FILES})

diff --git a/packaging/debian/patches/maemo-startup-files.diff b/packaging/debian/patches/maemo-startup-files.diff
index 146f815..f13304f 100644 (file)
--- a/packaging/debian/patches/maemo-startup-files.diff
+++ b/packaging/debian/patches/maemo-startup-files.diff
@@ -1,8 +1,8 @@
-Index: marble-1.1.90/src/CMakeLists.txt
+Index: src-fremantle/src/CMakeLists.txt
 ===================================================================
---- marble-1.1.90.orig/src/CMakeLists.txt      2011-06-21 18:34:08.000000000 +0200
-+++ marble-1.1.90/src/CMakeLists.txt   2011-06-22 18:49:32.000000000 +0200
-@@ -202,3 +202,12 @@
+--- src-fremantle.orig/src/CMakeLists.txt      2012-08-12 12:53:12.000000000 +0200
++++ src-fremantle/src/CMakeLists.txt   2012-08-12 12:53:42.000000000 +0200
+@@ -233,3 +233,12 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/config-marble.h.cmake
    ${CMAKE_CURRENT_BINARY_DIR}/config-marble.h
  )
@@ -15,10 +15,10 @@ Index: marble-1.1.90/src/CMakeLists.txt
 +  ${CMAKE_INSTALL_PREFIX}/../../usr/share/applications/hildon/ )
 +install ( FILES marble.service DESTINATION
 +  ${CMAKE_INSTALL_PREFIX}/../../usr/share/dbus-1/services/ )
-Index: marble-1.1.90/src/marble.desktop
+Index: src-fremantle/src/marble.desktop
 ===================================================================
---- marble-1.1.90.orig/src/marble.desktop      2011-06-21 18:34:08.000000000 +0200
-+++ marble-1.1.90/src/marble.desktop   2011-06-22 18:49:32.000000000 +0200
+--- src-fremantle.orig/src/marble.desktop      2012-08-12 12:53:12.000000000 +0200
++++ src-fremantle/src/marble.desktop   2012-08-12 12:53:42.000000000 +0200
 @@ -1,7 +1,6 @@
  [Desktop Entry]
  Type=Application
@@ -28,7 +28,7 @@ Index: marble-1.1.90/src/marble.desktop
  Name=Marble
  Name[ast]=Marble
  Name[bg]=Marble
-@@ -111,5 +110,9 @@
+@@ -116,5 +115,9 @@
  GenericName[zh_TW]=桌面星象儀
  Icon=marble
  Terminal=false
@@ -39,10 +39,10 @@ Index: marble-1.1.90/src/marble.desktop
 +X-HildonDesk-ShowInToolbar=true
 +X-Osso-Service=org.kde.edu.marble
 +X-Osso-Type=application/x-executable
-Index: marble-1.1.90/src/marble.sh
+Index: src-fremantle/src/marble.sh
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ marble-1.1.90/src/marble.sh        2011-06-22 18:49:32.000000000 +0200
++++ src-fremantle/src/marble.sh        2012-08-12 12:53:42.000000000 +0200
 @@ -0,0 +1,21 @@
 +#!/bin/sh
 +
@@ -65,29 +65,27 @@ Index: marble-1.1.90/src/marble.sh
 +export PATH
 +
 +/opt/marble/bin/marble $*
-Index: marble-1.1.90/src/marble.service
+Index: src-fremantle/src/marble.service
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ marble-1.1.90/src/marble.service   2011-06-22 18:49:32.000000000 +0200
++++ src-fremantle/src/marble.service   2012-08-12 12:53:42.000000000 +0200
 @@ -0,0 +1,3 @@
 +[D-BUS Service]
 +Name=org.kde.edu.marble
 +Exec=/opt/marble/bin/marble.sh
-Index: marble-1.1.90/data/CMakeLists.txt
+Index: src-fremantle/data/CMakeLists.txt
 ===================================================================
---- marble-1.1.90.orig/data/CMakeLists.txt     2011-06-21 18:34:08.000000000 +0200
-+++ marble-1.1.90/data/CMakeLists.txt  2011-06-22 18:49:32.000000000 +0200
-@@ -249,11 +249,12 @@
+--- src-fremantle.orig/data/CMakeLists.txt     2012-08-12 12:53:12.000000000 +0200
++++ src-fremantle/data/CMakeLists.txt  2012-08-12 13:18:38.000000000 +0200
+@@ -253,10 +253,10 @@
+ endif(MOBILE)
  
  if(NOT APPLE AND NOT WIN32)
-   if(QTONLY)
--    set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
-+    set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/../../usr/share/icons)
-   endif(QTONLY)
-     install (FILES icons/hi128-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/apps/ RENAME marble.png)
-     install (FILES icons/hi64-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/64x64/apps/ RENAME marble.png)
-     install (FILES icons/hi48-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps/ RENAME marble.png)
-+    install (FILES icons/hi32-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/26x26/apps/ RENAME marble.png)
-     install (FILES icons/hi32-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/32x32/apps/ RENAME marble.png)
-     install (FILES icons/hi22-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/22x22/apps/ RENAME marble.png)
-     install (FILES icons/hi16-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/16x16/apps/ RENAME marble.png)
+-  install (FILES icons/hi128-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/apps/ RENAME marble.png)
+   install (FILES icons/hi64-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/64x64/apps/ RENAME marble.png)
+   install (FILES icons/hi48-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps/ RENAME marble.png)
+   install (FILES icons/hi32-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/32x32/apps/ RENAME marble.png)
++  install (FILES icons/hi32-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/26x26/apps/ RENAME marble.png)
+   install (FILES icons/hi22-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/22x22/apps/ RENAME marble.png)
+   install (FILES icons/hi16-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/16x16/apps/ RENAME marble.png)
+ endif(NOT APPLE AND NOT WIN32 )

diff --git a/packaging/debian/patches/migration-warning.diff b/packaging/debian/patches/migration-warning.diff
index b89a5c7..50a3c77 100644 (file)
--- a/packaging/debian/patches/migration-warning.diff
+++ b/packaging/debian/patches/migration-warning.diff
@@ -1,17 +1,17 @@
-Index: src-1.1/data/CMakeLists.txt
+Index: src-fremantle/data/CMakeLists.txt
 ===================================================================
---- src-1.1.orig/data/CMakeLists.txt   2011-04-15 19:19:43.000000000 +0200
-+++ src-1.1/data/CMakeLists.txt        2011-04-15 19:20:50.000000000 +0200
-@@ -344,3 +344,5 @@
- install (FILES
-   ${AUDIO_FILES}
- DESTINATION ${MARBLE_DATA_INSTALL_PATH}/audio)
+--- src-fremantle.orig/data/CMakeLists.txt     2012-08-12 19:36:55.000000000 +0200
++++ src-fremantle/data/CMakeLists.txt  2012-08-12 19:36:56.000000000 +0200
+@@ -380,3 +380,5 @@
+ 
+ FILE (GLOB_RECURSE DGML_FILES maps/*.dgml)
+ MARBLE_ADD_PROJECT_RESOURCES(${DGML_FILES})
 +
 +install (FILES migration-warning.txt DESTINATION ${MARBLE_DATA_INSTALL_PATH}/)
-Index: src-1.1/data/migration-warning.txt
+Index: src-fremantle/data/migration-warning.txt
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ src-1.1/data/migration-warning.txt 2011-04-15 19:17:04.000000000 +0200
++++ src-fremantle/data/migration-warning.txt   2012-08-12 19:36:56.000000000 +0200
 @@ -0,0 +1,3 @@
 +Marble can share OpenStreetMap data with other applications on this device. This helps to save disk space and reduce network traffic.
 +

diff --git a/packaging/debian/patches/newstuff-mapthemes.diff b/packaging/debian/patches/newstuff-mapthemes.diff
index b2e0652..66602de 100644 (file)
--- a/packaging/debian/patches/newstuff-mapthemes.diff
+++ b/packaging/debian/patches/newstuff-mapthemes.diff
@@ -1,8 +1,8 @@
 Index: src-fremantle/data/CMakeLists.txt
 ===================================================================
---- src-fremantle.orig/data/CMakeLists.txt     2012-02-19 11:51:05.000000000 +0100
-+++ src-fremantle/data/CMakeLists.txt  2012-02-19 11:55:20.000000000 +0100
-@@ -145,6 +145,113 @@
+--- src-fremantle.orig/data/CMakeLists.txt     2012-08-12 12:54:15.000000000 +0200
++++ src-fremantle/data/CMakeLists.txt  2012-08-12 12:54:20.000000000 +0200
+@@ -141,6 +141,113 @@
  DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/hillshading/0/0)
  
  install (FILES

diff --git a/packaging/debian/rules b/packaging/debian/rules
index 275d7b3..e6beb32 100755 (executable)
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 
-CMAKE = cmake -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/tmp/opt/marble -DMARBLE_DATA_INSTALL_PATH=$(CURDIR)/debian/tmp/opt/marble/share/marble/data -DQTONLY=ON -DMARBLE_DATA_PATH=/opt/marble/share/marble/data -DMARBLE_PLUGIN_INSTALL_PATH=$(CURDIR)/debian/tmp/opt/marble/lib/marble/plugins -DMARBLE_PLUGIN_PATH=/opt/marble/lib/marble/plugins -DPACKAGE_ROOT_PREFIX=$(CURDIR)/debian/tmp -DCMAKE_SKIP_RPATH=ON -DBUILD_MARBLE_TESTS=OFF -DENABLE_TESTS=FALSE -DCMAKE_BUILD_TYPE=Release -DMOBILE=ON -DBUILD_INHIBIT_SCREENSAVER_PLUGIN=TRUE
+CMAKE = cmake -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/tmp/opt/marble -DMARBLE_DATA_INSTALL_PATH=$(CURDIR)/debian/tmp/opt/marble/share/marble/data -DQTONLY=ON -DMARBLE_DATA_PATH=/opt/marble/share/marble/data -DMARBLE_PLUGIN_INSTALL_PATH=$(CURDIR)/debian/tmp/opt/marble/lib/marble/plugins -DMARBLE_PLUGIN_PATH=/opt/marble/lib/marble/plugins -DPACKAGE_ROOT_PREFIX=$(CURDIR)/debian/tmp -DCMAKE_SKIP_RPATH=ON -DBUILD_MARBLE_TESTS=OFF -DENABLE_TESTS=FALSE -DCMAKE_BUILD_TYPE=Debug -DMOBILE=ON -DBUILD_INHIBIT_SCREENSAVER_PLUGIN=TRUE -DICON_INSTALL_DIR:PATH=../../usr/share/icons
 
 DEB_MAKE_INSTALL_TARGET = install