Use $HOME instead of /home/user. Refresh hunks.

[marble] / packaging / debian / patches / maemo-startup-files.diff

diff --git a/packaging/debian/patches/maemo-startup-files.diff b/packaging/debian/patches/maemo-startup-files.diff
index 22d03da..6075507 100644 (file)
--- a/packaging/debian/patches/maemo-startup-files.diff
+++ b/packaging/debian/patches/maemo-startup-files.diff
@@ -1,7 +1,7 @@
-Index: marble-0.85+svn1207808/src/CMakeLists.txt
+Index: marble-0.90+svn1209861/src/CMakeLists.txt
 ===================================================================
---- marble-0.85+svn1207808.orig/src/CMakeLists.txt     2010-12-19 13:16:39.000000000 -0500
-+++ marble-0.85+svn1207808/src/CMakeLists.txt  2010-12-19 15:03:25.000000000 -0500
+--- marble-0.90+svn1209861.orig/src/CMakeLists.txt     2010-10-20 07:28:18.000000000 -0400
++++ marble-0.90+svn1209861/src/CMakeLists.txt  2010-12-28 05:56:23.000000000 -0500
 @@ -202,3 +202,12 @@
    ${CMAKE_CURRENT_SOURCE_DIR}/config-marble.h.cmake
    ${CMAKE_CURRENT_BINARY_DIR}/config-marble.h
@@ -15,10 +15,10 @@ Index: marble-0.85+svn1207808/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-0.85+svn1207808/src/marble.desktop
+Index: marble-0.90+svn1209861/src/marble.desktop
 ===================================================================
---- marble-0.85+svn1207808.orig/src/marble.desktop     2010-12-19 13:16:18.000000000 -0500
-+++ marble-0.85+svn1207808/src/marble.desktop  2010-12-19 13:16:32.000000000 -0500
+--- marble-0.90+svn1209861.orig/src/marble.desktop     2010-12-15 00:54:43.000000000 -0500
++++ marble-0.90+svn1209861/src/marble.desktop  2010-12-28 05:56:23.000000000 -0500
 @@ -1,7 +1,6 @@
  [Desktop Entry]
  Type=Application
@@ -39,10 +39,10 @@ Index: marble-0.85+svn1207808/src/marble.desktop
 +X-HildonDesk-ShowInToolbar=true
 +X-Osso-Service=org.kde.edu.marble
 +X-Osso-Type=application/x-executable
-Index: marble-0.85+svn1207808/src/marble.sh
+Index: marble-0.90+svn1209861/src/marble.sh
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ marble-0.85+svn1207808/src/marble.sh       2010-12-19 13:19:17.000000000 -0500
++++ marble-0.90+svn1209861/src/marble.sh       2010-12-28 05:56:45.000000000 -0500
 @@ -0,0 +1,21 @@
 +#!/bin/sh
 +
@@ -53,7 +53,7 @@ Index: marble-0.85+svn1207808/src/marble.sh
 +# $ 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/user/MyDocs/.local/share}"
++XDG_DATA_HOME="${MARBLE_DATA_HOME:-${HOME}/MyDocs/.local/share}"
 +export XDG_DATA_HOME
 +
 +# Marble is installed in /opt/marble. Add it's library
@@ -65,18 +65,18 @@ Index: marble-0.85+svn1207808/src/marble.sh
 +export PATH
 +
 +/opt/marble/bin/marble $*
-Index: marble-0.85+svn1207808/src/marble.service
+Index: marble-0.90+svn1209861/src/marble.service
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ marble-0.85+svn1207808/src/marble.service  2010-12-19 15:03:43.000000000 -0500
++++ marble-0.90+svn1209861/src/marble.service  2010-12-28 05:56:23.000000000 -0500
 @@ -0,0 +1,3 @@
 +[D-BUS Service]
 +Name=org.kde.edu.marble
 +Exec=/opt/marble/bin/marble.sh
-Index: marble-0.85+svn1207808/data/CMakeLists.txt
+Index: marble-0.90+svn1209861/data/CMakeLists.txt
 ===================================================================
---- marble-0.85+svn1207808.orig/data/CMakeLists.txt    2010-12-19 15:06:33.000000000 -0500
-+++ marble-0.85+svn1207808/data/CMakeLists.txt 2010-12-19 15:54:14.000000000 -0500
+--- marble-0.90+svn1209861.orig/data/CMakeLists.txt    2010-11-28 14:58:04.000000000 -0500
++++ marble-0.90+svn1209861/data/CMakeLists.txt 2010-12-28 05:56:23.000000000 -0500
 @@ -231,11 +231,12 @@
  
  if(NOT APPLE AND NOT WIN32)