projects / marble / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3f4f779)
update patches, remove opencyclemap
authorDennis Nienhüser <nienhues@fzi.de>
Wed, 22 Jun 2011 17:29:02 +0000 (19:29 +0200)
committerDennis Nienhüser <nienhues@fzi.de>
Wed, 22 Jun 2011 17:29:02 +0000 (19:29 +0200)
packaging/debian/marble-maps.install patch | blob | history
packaging/debian/patches/install-lang-files.diff patch | blob | history
packaging/debian/patches/maemo-startup-files.diff patch | blob | history
packaging/debian/patches/newstuff-mapthemes.diff patch | blob | history

diff --git a/packaging/debian/marble-maps.install b/packaging/debian/marble-maps.install
index 4aeed4e..69e0252 100644 (file)
--- a/packaging/debian/marble-maps.install
+++ b/packaging/debian/marble-maps.install
@@ -4,7 +4,6 @@ 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/opencyclemap
 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/install-lang-files.diff b/packaging/debian/patches/install-lang-files.diff
index 0a30de0..98694fa 100644 (file)
--- a/packaging/debian/patches/install-lang-files.diff
+++ b/packaging/debian/patches/install-lang-files.diff
@@ -1,10 +1,10 @@
-Index: marble-0.85+svn1207808/data/CMakeLists.txt
+Index: marble-1.1.90/data/CMakeLists.txt
 ===================================================================
---- marble-0.85+svn1207808.orig/data/CMakeLists.txt    2010-12-19 16:56:16.000000000 -0500
-+++ marble-0.85+svn1207808/data/CMakeLists.txt 2010-12-19 16:56:21.000000000 -0500
-@@ -229,6 +229,11 @@
-   ${PLACEMARK_FILES}
- DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks)
+--- marble-1.1.90.orig/data/CMakeLists.txt     2011-06-22 18:49:32.000000000 +0200
++++ marble-1.1.90/data/CMakeLists.txt  2011-06-22 18:49:49.000000000 +0200
+@@ -247,6 +247,11 @@
+     install (FILES placemarks/cityplacemarks.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks)
+ endif(MOBILE)
  
 +FILE (GLOB LANG_FILES lang/marble-*)
 +install (FILES
diff --git a/packaging/debian/patches/maemo-startup-files.diff b/packaging/debian/patches/maemo-startup-files.diff
index 6075507..146f815 100644 (file)
--- a/packaging/debian/patches/maemo-startup-files.diff
+++ b/packaging/debian/patches/maemo-startup-files.diff
@@ -1,7 +1,7 @@
-Index: marble-0.90+svn1209861/src/CMakeLists.txt
+Index: marble-1.1.90/src/CMakeLists.txt
 ===================================================================
---- 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
+--- marble-1.1.90.orig/src/CMakeLists.txt      2011-06-21 18:34:08.000000000 +0200
++++ marble-1.1.90/src/CMakeLists.txt   2011-06-22 18:49:32.000000000 +0200
 @@ -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.90+svn1209861/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.90+svn1209861/src/marble.desktop
+Index: marble-1.1.90/src/marble.desktop
 ===================================================================
---- 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
+--- marble-1.1.90.orig/src/marble.desktop      2011-06-21 18:34:08.000000000 +0200
++++ marble-1.1.90/src/marble.desktop   2011-06-22 18:49:32.000000000 +0200
 @@ -1,7 +1,6 @@
  [Desktop Entry]
  Type=Application
@@ -28,7 +28,7 @@ Index: marble-0.90+svn1209861/src/marble.desktop
  Name=Marble
  Name[ast]=Marble
  Name[bg]=Marble
-@@ -108,5 +107,9 @@
+@@ -111,5 +110,9 @@
  GenericName[zh_TW]=桌面星象儀
  Icon=marble
  Terminal=false
@@ -39,10 +39,10 @@ Index: marble-0.90+svn1209861/src/marble.desktop
 +X-HildonDesk-ShowInToolbar=true
 +X-Osso-Service=org.kde.edu.marble
 +X-Osso-Type=application/x-executable
-Index: marble-0.90+svn1209861/src/marble.sh
+Index: marble-1.1.90/src/marble.sh
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ marble-0.90+svn1209861/src/marble.sh       2010-12-28 05:56:45.000000000 -0500
++++ marble-1.1.90/src/marble.sh        2011-06-22 18:49:32.000000000 +0200
 @@ -0,0 +1,21 @@
 +#!/bin/sh
 +
@@ -65,19 +65,19 @@ Index: marble-0.90+svn1209861/src/marble.sh
 +export PATH
 +
 +/opt/marble/bin/marble $*
-Index: marble-0.90+svn1209861/src/marble.service
+Index: marble-1.1.90/src/marble.service
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ marble-0.90+svn1209861/src/marble.service  2010-12-28 05:56:23.000000000 -0500
++++ marble-1.1.90/src/marble.service   2011-06-22 18:49:32.000000000 +0200
 @@ -0,0 +1,3 @@
 +[D-BUS Service]
 +Name=org.kde.edu.marble
 +Exec=/opt/marble/bin/marble.sh
-Index: marble-0.90+svn1209861/data/CMakeLists.txt
+Index: marble-1.1.90/data/CMakeLists.txt
 ===================================================================
---- 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 @@
+--- marble-1.1.90.orig/data/CMakeLists.txt     2011-06-21 18:34:08.000000000 +0200
++++ marble-1.1.90/data/CMakeLists.txt  2011-06-22 18:49:32.000000000 +0200
+@@ -249,11 +249,12 @@
  
  if(NOT APPLE AND NOT WIN32)
    if(QTONLY)
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
Unnamed repository; edit this file to name it for gitweb.