Announce migration, optional cancelling.

diff --git a/packaging/debian/marble.install b/packaging/debian/marble.install
index a1f21a1..0fe599b 100644 (file)
--- a/packaging/debian/marble.install
+++ b/packaging/debian/marble.install
@@ -9,3 +9,4 @@ usr/share/icons/hicolor/26x26/apps/marble.png
 usr/share/icons/hicolor/32x32/apps/marble.png
 usr/share/icons/hicolor/22x22/apps/marble.png
 usr/share/icons/hicolor/16x16/apps/marble.png
+opt/marble/share/marble/data/migration-warning.txt

diff --git a/packaging/debian/marble.postinst b/packaging/debian/marble.postinst
index e634624..666bed5 100755 (executable)
--- a/packaging/debian/marble.postinst
+++ b/packaging/debian/marble.postinst
@@ -44,15 +44,8 @@ test -e "${MIGRATED}" && exit 0
 
 # If the migration has to move files, ask the user to skip it since it can
 # take some minutes to finish
-confirmation="Marble can share OpenStreetMap data with other applications on this device. This helps to save disk space and reduce network traffic.
 
-Press 'Accept' to enable sharing and migrate already downloaded OpenStreetMap data. This can take several minutes. Alternatively you can skip this step now and data sharing will be disabled. You'll be prompted again to enable it during the next Marble version upgrade."
-
-#test -e "${OSM_DIR_10}" && test -e "${OSM_DIR_11}" && { echo "${confirmation}" | maemo-confirm-text "Enable OpenStreetMap Data Sharing" /dev/stdin || exit 0; }
-#message="$(mktemp marbleXXXXXX)"
-#echo "${confirmation}" > "${message}"
-#maemo-confirm-text "Enable OpenStreetMap Data Sharing" "${message}"
-#rm "${message}"
+test -e "${OSM_DIR_10}" && test -e "${OSM_DIR_11}" && { maemo-confirm-text "Enable OpenStreetMap Data Sharing" /opt/marble/share/marble/data/migration-warning.txt || exit 0; }
 
 # Tile migration
 mkdir -p "${OSM_DIR_11}"

diff --git a/packaging/debian/patches/migration-warning.diff b/packaging/debian/patches/migration-warning.diff
new file mode 100644 (file)
index 0000000..b89a5c7
--- /dev/null
+++ b/packaging/debian/patches/migration-warning.diff
@@ -0,0 +1,18 @@
+Index: src-1.1/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)
++
++install (FILES migration-warning.txt DESTINATION ${MARBLE_DATA_INSTALL_PATH}/)
+Index: src-1.1/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
+@@ -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.
++
++Press 'Accept' to enable sharing and migrate existing OpenStreetMap data. This can take several minutes. Alternatively you can skip this step now and data sharing will be disabled. You'll be prompted again to enable it during the next Marble version upgrade.

diff --git a/packaging/debian/patches/series b/packaging/debian/patches/series
index b090374..66b8c70 100644 (file)
--- a/packaging/debian/patches/series
+++ b/packaging/debian/patches/series
@@ -2,3 +2,4 @@ globe-projection-rangecheck.diff
 maemo-startup-files.diff
 install-lang-files.diff
 newstuff-mapthemes.diff
+migration-warning.diff