Release target for cmake, change XDG data home. Please move your maps to /home/user...

diff --git a/packaging/debian/marble.sh b/packaging/debian/marble.sh
index b148f1b..4a6047b 100755 (executable)
--- a/packaging/debian/marble.sh
+++ b/packaging/debian/marble.sh
@@ -7,7 +7,7 @@
 # $ 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}"
+XDG_DATA_HOME="${MARBLE_DATA_HOME:-/home/user/MyDocs/.local/share}"
 export XDG_DATA_HOME
 
 # Marble is installed in /opt/marble. Add it's library

diff --git a/packaging/debian/rules b/packaging/debian/rules
index cddadc3..3b070f8 100755 (executable)
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.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
+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
 
 DEB_MAKE_INSTALL_TARGET = install