From b0766590e950a88fa2e5433188587d8399257568 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Dennis=20Nienh=C3=BCser?= Date: Tue, 28 Dec 2010 05:59:06 -0500 Subject: [PATCH] Use $HOME instead of /home/user. Refresh hunks. --- packaging/debian/patches/maemo-startup-files.diff | 28 ++++++------- packaging/debian/patches/tracking-dialog.diff | 44 ++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/packaging/debian/patches/maemo-startup-files.diff b/packaging/debian/patches/maemo-startup-files.diff index 22d03da..6075507 100644 --- 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) diff --git a/packaging/debian/patches/tracking-dialog.diff b/packaging/debian/patches/tracking-dialog.diff index 7cdc57d..5bbaca5 100644 --- a/packaging/debian/patches/tracking-dialog.diff +++ b/packaging/debian/patches/tracking-dialog.diff @@ -1,7 +1,7 @@ -Index: marble-0.85+svn1207808/src/lib/CurrentLocationWidget.cpp +Index: marble-0.90+svn1209861/src/lib/CurrentLocationWidget.cpp =================================================================== ---- marble-0.85+svn1207808.orig/src/lib/CurrentLocationWidget.cpp 2010-12-19 17:24:16.000000000 -0500 -+++ marble-0.85+svn1207808/src/lib/CurrentLocationWidget.cpp 2010-12-19 17:24:21.000000000 -0500 +--- marble-0.90+svn1209861.orig/src/lib/CurrentLocationWidget.cpp 2010-12-28 05:57:25.000000000 -0500 ++++ marble-0.90+svn1209861/src/lib/CurrentLocationWidget.cpp 2010-12-28 05:57:48.000000000 -0500 @@ -31,6 +31,9 @@ // Ui #include "ui_CurrentLocationWidget.h" @@ -127,10 +127,10 @@ Index: marble-0.85+svn1207808/src/lib/CurrentLocationWidget.cpp } #include "CurrentLocationWidget.moc" -Index: marble-0.85+svn1207808/src/lib/CurrentLocationWidget.h +Index: marble-0.90+svn1209861/src/lib/CurrentLocationWidget.h =================================================================== ---- marble-0.85+svn1207808.orig/src/lib/CurrentLocationWidget.h 2010-12-19 17:24:16.000000000 -0500 -+++ marble-0.85+svn1207808/src/lib/CurrentLocationWidget.h 2010-12-19 17:24:21.000000000 -0500 +--- marble-0.90+svn1209861.orig/src/lib/CurrentLocationWidget.h 2010-12-28 05:57:25.000000000 -0500 ++++ marble-0.90+svn1209861/src/lib/CurrentLocationWidget.h 2010-12-28 05:57:48.000000000 -0500 @@ -72,6 +72,9 @@ Q_PRIVATE_SLOT( d, void updateAutoZoomCheckBox( bool autoZoom ) ) @@ -141,10 +141,10 @@ Index: marble-0.85+svn1207808/src/lib/CurrentLocationWidget.h }; } -Index: marble-0.85+svn1207808/src/lib/CurrentLocationWidget.ui +Index: marble-0.90+svn1209861/src/lib/CurrentLocationWidget.ui =================================================================== ---- marble-0.85+svn1207808.orig/src/lib/CurrentLocationWidget.ui 2010-12-19 17:24:16.000000000 -0500 -+++ marble-0.85+svn1207808/src/lib/CurrentLocationWidget.ui 2010-12-19 17:24:21.000000000 -0500 +--- marble-0.90+svn1209861.orig/src/lib/CurrentLocationWidget.ui 2010-12-28 05:57:25.000000000 -0500 ++++ marble-0.90+svn1209861/src/lib/CurrentLocationWidget.ui 2010-12-28 05:57:48.000000000 -0500 @@ -7,7 +7,7 @@ 0 0 @@ -211,10 +211,10 @@ Index: marble-0.85+svn1207808/src/lib/CurrentLocationWidget.ui false -Index: marble-0.85+svn1207808/src/lib/PositionTracking.cpp +Index: marble-0.90+svn1209861/src/lib/PositionTracking.cpp =================================================================== ---- marble-0.85+svn1207808.orig/src/lib/PositionTracking.cpp 2010-12-19 17:24:16.000000000 -0500 -+++ marble-0.85+svn1207808/src/lib/PositionTracking.cpp 2010-12-19 17:24:21.000000000 -0500 +--- marble-0.90+svn1209861.orig/src/lib/PositionTracking.cpp 2010-12-28 05:57:25.000000000 -0500 ++++ marble-0.90+svn1209861/src/lib/PositionTracking.cpp 2010-12-28 05:57:48.000000000 -0500 @@ -16,14 +16,19 @@ #include "GeoDataPlacemark.h" #include "GeoDataStyle.h" @@ -262,10 +262,10 @@ Index: marble-0.85+svn1207808/src/lib/PositionTracking.cpp void PositionTracking::clearTrack() { GeoDataPlacemark *placemark = static_cast(d->m_document->child(d->m_document->size()-1)); -Index: marble-0.85+svn1207808/src/lib/PositionTracking.h +Index: marble-0.90+svn1209861/src/lib/PositionTracking.h =================================================================== ---- marble-0.85+svn1207808.orig/src/lib/PositionTracking.h 2010-12-19 17:24:16.000000000 -0500 -+++ marble-0.85+svn1207808/src/lib/PositionTracking.h 2010-12-19 17:24:21.000000000 -0500 +--- marble-0.90+svn1209861.orig/src/lib/PositionTracking.h 2010-12-28 05:57:25.000000000 -0500 ++++ marble-0.90+svn1209861/src/lib/PositionTracking.h 2010-12-28 05:57:48.000000000 -0500 @@ -84,6 +84,11 @@ void setTrackVisible ( bool visible ); @@ -278,10 +278,10 @@ Index: marble-0.85+svn1207808/src/lib/PositionTracking.h * Removes all track segments which were recorded */ void clearTrack(); -Index: marble-0.85+svn1207808/src/QtMainWindow.h +Index: marble-0.90+svn1209861/src/QtMainWindow.h =================================================================== ---- marble-0.85+svn1207808.orig/src/QtMainWindow.h 2010-12-19 17:24:16.000000000 -0500 -+++ marble-0.85+svn1207808/src/QtMainWindow.h 2010-12-19 17:24:21.000000000 -0500 +--- marble-0.90+svn1209861.orig/src/QtMainWindow.h 2010-12-28 05:57:25.000000000 -0500 ++++ marble-0.90+svn1209861/src/QtMainWindow.h 2010-12-28 05:57:48.000000000 -0500 @@ -120,6 +120,7 @@ void showMapViewDialog(); void showLegendTab( bool enabled ); @@ -302,10 +302,10 @@ Index: marble-0.85+svn1207808/src/QtMainWindow.h RoutingWidget *m_routingWidget; }; -Index: marble-0.85+svn1207808/src/QtMainWindow.cpp +Index: marble-0.90+svn1209861/src/QtMainWindow.cpp =================================================================== ---- marble-0.85+svn1207808.orig/src/QtMainWindow.cpp 2010-12-19 17:24:16.000000000 -0500 -+++ marble-0.85+svn1207808/src/QtMainWindow.cpp 2010-12-19 17:24:21.000000000 -0500 +--- marble-0.90+svn1209861.orig/src/QtMainWindow.cpp 2010-12-28 05:57:25.000000000 -0500 ++++ marble-0.90+svn1209861/src/QtMainWindow.cpp 2010-12-28 05:57:48.000000000 -0500 @@ -41,6 +41,7 @@ #include @@ -332,7 +332,7 @@ Index: marble-0.85+svn1207808/src/QtMainWindow.cpp m_controlView->marbleControl()->setNavigationTabShown( false ); m_controlView->marbleControl()->setLegendTabShown( false ); -@@ -1266,6 +1271,28 @@ +@@ -1268,6 +1273,28 @@ m_routingDialog->activateWindow(); } -- 1.7.9.5