From 09b9acdafdb5edcd56fd086c9b3e3efe9d1e637a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Dennis=20Nienh=C3=BCser?= Date: Tue, 4 Jan 2011 21:45:16 +0100 Subject: [PATCH] update hillshading location --- packaging/debian/marble-maps.install | 1 + packaging/debian/patches/newstuff-mapthemes.diff | 16 ++++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packaging/debian/marble-maps.install b/packaging/debian/marble-maps.install index 738258b..69e0252 100644 --- a/packaging/debian/marble-maps.install +++ b/packaging/debian/marble-maps.install @@ -3,6 +3,7 @@ opt/marble/share/marble/data/maps/earth/bluemarble opt/marble/share/marble/data/maps/earth/citylights opt/marble/share/marble/data/maps/earth/clouds opt/marble/share/marble/data/maps/earth/hikebikemap +opt/marble/share/marble/data/maps/earth/hillshading opt/marble/share/marble/data/maps/earth/osmarender opt/marble/share/marble/data/maps/earth/plain opt/marble/share/marble/data/maps/earth/precip-dec diff --git a/packaging/debian/patches/newstuff-mapthemes.diff b/packaging/debian/patches/newstuff-mapthemes.diff index 4e991fd..bf57356 100644 --- a/packaging/debian/patches/newstuff-mapthemes.diff +++ b/packaging/debian/patches/newstuff-mapthemes.diff @@ -1,8 +1,8 @@ -Index: marble-0.90+svn1210422/data/CMakeLists.txt +Index: marble-0.95+svn1211246/data/CMakeLists.txt =================================================================== ---- marble-0.90+svn1210422.orig/data/CMakeLists.txt 2010-12-31 06:17:07.000000000 -0500 -+++ marble-0.90+svn1210422/data/CMakeLists.txt 2010-12-31 06:17:33.000000000 -0500 -@@ -128,6 +128,103 @@ +--- marble-0.95+svn1211246.orig/data/CMakeLists.txt 2011-01-04 21:25:41.000000000 +0100 ++++ marble-0.95+svn1211246/data/CMakeLists.txt 2011-01-04 21:27:04.000000000 +0100 +@@ -128,6 +128,99 @@ DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/openstreetmap/0/0) install (FILES @@ -57,8 +57,8 @@ Index: marble-0.90+svn1210422/data/CMakeLists.txt +DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/osmarender/0/0) + +install (FILES -+maps/earth/osmarender/hills-nc/0/0/0.png -+DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/osmarender/hills-nc/0/0) ++maps/earth/hillshading/0/0/0.png ++DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/hillshading/0/0) + +install (FILES +maps/earth/hikebikemap/hikebikemap.dgml @@ -95,10 +95,6 @@ Index: marble-0.90+svn1210422/data/CMakeLists.txt +DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/hikebikemap/0/0) + +install (FILES -+maps/earth/hikebikemap/hillshading/0/0/0.png -+DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/hikebikemap/hillshading/0/0) -+ -+install (FILES +maps/earth/hikebikemap/lighting/0/0/0.png +DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/hikebikemap/lighting/0/0) + -- 1.7.9.5