update patches, remove opencyclemap

[marble] / packaging / debian / patches / newstuff-mapthemes.diff

diff --git a/packaging/debian/patches/newstuff-mapthemes.diff b/packaging/debian/patches/newstuff-mapthemes.diff
index f18acef..b3b9289 100644 (file)
--- a/packaging/debian/patches/newstuff-mapthemes.diff
+++ b/packaging/debian/patches/newstuff-mapthemes.diff
@@ -1,9 +1,9 @@
-Index: marble-1.1.0/data/CMakeLists.txt
+Index: marble-1.1.90/data/CMakeLists.txt
 ===================================================================
---- marble-1.1.0.orig/data/CMakeLists.txt      2011-05-24 23:03:27.000000000 +0200
-+++ marble-1.1.0/data/CMakeLists.txt   2011-05-24 23:04:14.000000000 +0200
-@@ -128,6 +128,124 @@
- DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/openstreetmap/0/0)
+--- 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 @@
+ DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/hillshading/0/0)
  
  install (FILES
 +maps/earth/osmarender/osmarender.dgml
@@ -57,10 +57,6 @@ Index: marble-1.1.0/data/CMakeLists.txt
 +DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/osmarender/0/0)
 +
 +install (FILES
-+maps/earth/hillshading/0/0/0.png
-+DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/hillshading/0/0)
-+
-+install (FILES
 +maps/earth/hikebikemap/hikebikemap.dgml
 +maps/earth/hikebikemap/hikebikemap-preview.png
 +maps/earth/hikebikemap/legend.html
@@ -99,31 +95,6 @@ Index: marble-1.1.0/data/CMakeLists.txt
 +DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/hikebikemap/lighting/0/0)
 +
 +install (FILES
-+maps/earth/opencyclemap/legend.html
-+maps/earth/opencyclemap/opencyclemap-preview.png
-+maps/earth/opencyclemap/opencyclemap.dgml
-+DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/opencyclemap)
-+
-+install (FILES
-+maps/earth/opencyclemap/legend/cyc_parking.png
-+maps/earth/opencyclemap/legend/nat_cyc_mag.png
-+maps/earth/opencyclemap/legend/cyc_pub.png
-+maps/earth/opencyclemap/legend/loc_cyc_mag.png
-+maps/earth/opencyclemap/legend/cyc_toilets.png
-+maps/earth/opencyclemap/legend/reg_cyc_mag.png
-+maps/earth/opencyclemap/legend/loc_cyc.png
-+maps/earth/opencyclemap/legend/reg_cyc.png
-+maps/earth/opencyclemap/legend/cyc_shop.png
-+maps/earth/opencyclemap/legend/cyc_drinking.png
-+maps/earth/opencyclemap/legend/nat_cyc.png
-+maps/earth/opencyclemap/legend/cyc_way.png
-+DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/opencyclemap/legend)
-+
-+install (FILES
-+maps/earth/opencyclemap/0/0/0.png
-+DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/opencyclemap/0/0)
-+
-+install (FILES
  maps/earth/temp-july/temp-july.jpg
  maps/earth/temp-july/temp-july-preview.png
  maps/earth/temp-july/temp-july.dgml