From 99f2299786ed53dfa24cf9a05a8896a138692186 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Dennis=20Nienh=C3=BCser?= Date: Sun, 19 Feb 2012 11:56:15 +0100 Subject: [PATCH] Install public transport map. --- packaging/debian/marble-maps.install | 1 + packaging/debian/patches/newstuff-mapthemes.diff | 26 ++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/packaging/debian/marble-maps.install b/packaging/debian/marble-maps.install index 69e0252..b84f580 100644 --- a/packaging/debian/marble-maps.install +++ b/packaging/debian/marble-maps.install @@ -8,6 +8,7 @@ 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 opt/marble/share/marble/data/maps/earth/precip-july +opt/marble/share/marble/data/maps/earth/public-transport opt/marble/share/marble/data/maps/earth/schagen1689 opt/marble/share/marble/data/maps/earth/srtm opt/marble/share/marble/data/maps/earth/temp-dec diff --git a/packaging/debian/patches/newstuff-mapthemes.diff b/packaging/debian/patches/newstuff-mapthemes.diff index b3b9289..b2e0652 100644 --- a/packaging/debian/patches/newstuff-mapthemes.diff +++ b/packaging/debian/patches/newstuff-mapthemes.diff @@ -1,8 +1,8 @@ -Index: marble-1.1.90/data/CMakeLists.txt +Index: src-fremantle/data/CMakeLists.txt =================================================================== ---- marble-1.1.90.orig/data/CMakeLists.txt 2011-06-22 18:49:49.000000000 +0200 -+++ marble-1.1.90/data/CMakeLists.txt 2011-06-22 18:50:52.000000000 +0200 -@@ -136,6 +136,95 @@ +--- src-fremantle.orig/data/CMakeLists.txt 2012-02-19 11:51:05.000000000 +0100 ++++ src-fremantle/data/CMakeLists.txt 2012-02-19 11:55:20.000000000 +0100 +@@ -145,6 +145,113 @@ DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/hillshading/0/0) install (FILES @@ -57,6 +57,24 @@ Index: marble-1.1.90/data/CMakeLists.txt +DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/osmarender/0/0) + +install (FILES ++maps/earth/public-transport/public-transport.png ++maps/earth/public-transport/legend.html ++maps/earth/public-transport/public-transport.dgml ++DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/public-transport) ++ ++install (FILES ++maps/earth/public-transport/legend/train_station.png ++maps/earth/public-transport/legend/subway_station.png ++maps/earth/public-transport/legend/light_rail_station.png ++maps/earth/public-transport/legend/bus_stop.png ++maps/earth/public-transport/legend/tram_station.png ++DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/public-transport/legend) ++ ++install (FILES ++maps/earth/public-transport/0/0/0.png ++DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/public-transport/0/0) ++ ++install (FILES +maps/earth/hikebikemap/hikebikemap.dgml +maps/earth/hikebikemap/hikebikemap-preview.png +maps/earth/hikebikemap/legend.html -- 1.7.9.5