don't patch sources during build

diff --git a/packaging/debian/maemo-launcher.diff b/packaging/debian/maemo-launcher.diff
new file mode 100644 (file)
index 0000000..9da7144
--- /dev/null
+++ b/packaging/debian/maemo-launcher.diff
@@ -0,0 +1,24 @@
+Index: usr/share/applications/hildon/marble.desktop
+===================================================================
+--- usr/share/applications/hildon/marble.desktop       2011-06-21 18:34:08.000000000 +0200
++++ usr/share/applications/hildon/marble.desktop       2011-06-22 18:49:32.000000000 +0200
+@@ -1,7 +1,6 @@
+ [Desktop Entry]
+ Type=Application
+-TryExec=marble
+-Exec=marble
++Exec=/opt/marble/bin/marble.sh
+ Name=Marble
+ Name[ast]=Marble
+ Name[bg]=Marble
+@@ -111,5 +110,9 @@
+ GenericName[zh_TW]=桌面星象儀
+ Icon=marble
+ Terminal=false
+-Categories=Qt;KDE;Education;Geography;
++StartupWMClass=marble
++X-Window-Icon=marble
+ X-DocPath=marble/index.html
++X-HildonDesk-ShowInToolbar=true
++X-Osso-Service=org.kde.edu.marble
++X-Osso-Type=application/x-executable

diff --git a/packaging/debian/marble.service b/packaging/debian/marble.service
new file mode 100644 (file)
index 0000000..5f09c58
--- /dev/null
+++ b/packaging/debian/marble.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.kde.edu.marble
+Exec=/opt/marble/bin/marble.sh

diff --git a/packaging/debian/marble.sh b/packaging/debian/marble.sh
new file mode 100644 (file)
index 0000000..1ae4d8f
--- /dev/null
+++ b/packaging/debian/marble.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Set the environment variable XDG_DATA_HOME to have
+# marble store cached data in /home/user/MyDocs/marble/data
+# Can be overridden by specifying an alternative path in
+# the environment variable MARBLE_DATA_HOME, e.g.
+# $ export MARBLE_DATA_HOME=/home/user
+# which would result in cached data being written to
+# /home/user/marble/data.
+XDG_DATA_HOME="${MARBLE_DATA_HOME:-${HOME}/MyDocs/.local/share}"
+export XDG_DATA_HOME
+
+# Marble is installed in /opt/marble. Add it's library
+# to the library search path.
+LD_LIBRARY_PATH="/opt/marble/lib:${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH
+
+PATH="/opt/marble/bin:${PATH}"
+export PATH
+
+/opt/marble/bin/marble $*

diff --git a/packaging/debian/migration-warning.txt b/packaging/debian/migration-warning.txt
new file mode 100644 (file)
index 0000000..90ec84b
--- /dev/null
+++ b/packaging/debian/migration-warning.txt
@@ -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/maemo-startup-files.diff b/packaging/debian/patches/maemo-startup-files.diff
deleted file mode 100644 (file)
index f13304f..0000000
--- a/packaging/debian/patches/maemo-startup-files.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-Index: src-fremantle/src/CMakeLists.txt
-===================================================================
---- 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
- )
-+
-+install ( FILES marble.sh DESTINATION bin/ PERMISSIONS
-+  OWNER_EXECUTE OWNER_WRITE OWNER_READ
-+  GROUP_EXECUTE GROUP_READ
-+  WORLD_READ WORLD_EXECUTE)
-+install ( FILES marble.desktop DESTINATION
-+  ${CMAKE_INSTALL_PREFIX}/../../usr/share/applications/hildon/ )
-+install ( FILES marble.service DESTINATION
-+  ${CMAKE_INSTALL_PREFIX}/../../usr/share/dbus-1/services/ )
-Index: src-fremantle/src/marble.desktop
-===================================================================
---- 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
--TryExec=marble
--Exec=marble
-+Exec=/opt/marble/bin/marble.sh
- Name=Marble
- Name[ast]=Marble
- Name[bg]=Marble
-@@ -116,5 +115,9 @@
- GenericName[zh_TW]=桌面星象儀
- Icon=marble
- Terminal=false
--Categories=Qt;KDE;Education;Geography;
-+StartupWMClass=marble
-+X-Window-Icon=marble
- X-DocPath=marble/index.html
-+X-HildonDesk-ShowInToolbar=true
-+X-Osso-Service=org.kde.edu.marble
-+X-Osso-Type=application/x-executable
-Index: src-fremantle/src/marble.sh
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ src-fremantle/src/marble.sh        2012-08-12 12:53:42.000000000 +0200
-@@ -0,0 +1,21 @@
-+#!/bin/sh
-+
-+# Set the environment variable XDG_DATA_HOME to have
-+# marble store cached data in /home/user/MyDocs/marble/data
-+# Can be overridden by specifying an alternative path in
-+# the environment variable MARBLE_DATA_HOME, e.g.
-+# $ export MARBLE_DATA_HOME=/home/user
-+# which would result in cached data being written to
-+# /home/user/marble/data.
-+XDG_DATA_HOME="${MARBLE_DATA_HOME:-${HOME}/MyDocs/.local/share}"
-+export XDG_DATA_HOME
-+
-+# Marble is installed in /opt/marble. Add it's library
-+# to the library search path.
-+LD_LIBRARY_PATH="/opt/marble/lib:${LD_LIBRARY_PATH}"
-+export LD_LIBRARY_PATH
-+
-+PATH="/opt/marble/bin:${PATH}"
-+export PATH
-+
-+/opt/marble/bin/marble $*
-Index: src-fremantle/src/marble.service
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ 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: src-fremantle/data/CMakeLists.txt
-===================================================================
---- 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)
--  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
deleted file mode 100644 (file)
index 50a3c77..0000000
--- a/packaging/debian/patches/migration-warning.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src-fremantle/data/CMakeLists.txt
-===================================================================
---- 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-fremantle/data/migration-warning.txt
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ 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.
-+
-+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 ff932ea..b5f80b4 100644 (file)
--- a/packaging/debian/patches/series
+++ b/packaging/debian/patches/series
@@ -1,6 +1,4 @@
-maemo-startup-files.diff
 install-lang-files.diff
 newstuff-mapthemes.diff
-migration-warning.diff
 download-basetiles.diff
 install-speakers.diff

diff --git a/packaging/debian/rules b/packaging/debian/rules
index 7fa83b9..dda91d6 100755 (executable)
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -17,7 +17,8 @@ CMAKE = cmake -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/tmp/opt/marble \
               -DCMAKE_BUILD_TYPE=Release \
               -DMOBILE=ON \
               -DBUILD_INHIBIT_SCREENSAVER_PLUGIN=TRUE \
-              -DICON_INSTALL_DIR:PATH=../../usr/share/icons \
+              -DICON_INSTALL_DIR=$(CURDIR)/debian/tmp/usr/share/icons \
+              -DAPPS_INSTALL_DIR=$(CURDIR)/debian/tmp/usr/share/applications/hildon \
               $(DEB_SRCDIR)
 
 DEB_MAKE_INSTALL_TARGET = install
@@ -80,5 +81,12 @@ clean::
 common-configure-arch::
        $(CMAKE)
 
+common-install-arch::
+       install -D -m u+rw-x,g+r-wx,o+r-wx $(DEB_SRCDIR)/data/icons/hi32-app-marble.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/26x26/apps/marble.png
+       install -D -m u+rwx,g+rx-w,o+rx-w $(CURDIR)/debian/marble.sh $(CURDIR)/debian/tmp/opt/marble/bin/marble.sh
+       install -D -m u+rw-x,g+r-wx,o+r-wx $(CURDIR)/debian/marble.service $(CURDIR)/debian/tmp/usr/share/dbus-1/services/marble.service
+       install -D -m u+rw-x,g+r-wx,o+r-wx $(CURDIR)/debian/migration-warning.txt $(CURDIR)/debian/tmp/opt/marble/share/marble/data/migration-warning.txt
+       patch -p0 -d $(DEB_DH_INSTALL_SOURCEDIR) < $(CURDIR)/debian/maemo-launcher.diff
+
 common-binary-post-install-indep::
        rm -f $(CURDIR)/debian/marble-data/usr/share/marble/data/LICENSE.txt