[routino] 08/13: add new patches and update old ones
Uwe Steinmann
steinm-guest at moszumanska.debian.org
Thu Apr 17 11:40:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
steinm-guest pushed a commit to branch master
in repository routino.
commit a7951dcd475be9414840325f55a95d931ff36253
Author: Uwe Steinmann <steinm at debian.org>
Date: Thu Apr 17 13:01:05 2014 +0200
add new patches and update old ones
---
debian/patches/fix_tests | 37 ++----------------------
debian/patches/install_documentation | 10 +++----
debian/patches/install_path | 10 +++----
debian/patches/map_bounds | 12 --------
debian/patches/maploader | 23 +++++++++++++++
debian/patches/mapprops | 56 ++++++++++++++++++++++++++++++++++++
debian/patches/rename_router | 25 +++++++++++-----
debian/patches/series | 5 ++--
debian/patches/web_path | 34 ++++++++++++++++++++++
9 files changed, 146 insertions(+), 66 deletions(-)
diff --git a/debian/patches/fix_tests b/debian/patches/fix_tests
index 703e16c..5c15464 100644
--- a/debian/patches/fix_tests
+++ b/debian/patches/fix_tests
@@ -3,7 +3,7 @@ Author: Thibaut Gridel <tgridel at free.fr>
--- routino-2.1.1.orig/src/test/a-b-c.sh
+++ routino-2.1.1/src/test/a-b-c.sh
-@@ -74,8 +74,8 @@ for waypoint in $waypoints; do
+@@ -88,8 +88,8 @@ for waypoint in $waypoints; do
[ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
@@ -16,7 +16,7 @@ Author: Thibaut Gridel <tgridel at free.fr>
--- routino-2.1.1.orig/src/test/a-b.sh
+++ routino-2.1.1/src/test/a-b.sh
-@@ -73,8 +73,8 @@ for waypoint in $waypoints; do
+@@ -87,8 +87,8 @@ for waypoint in $waypoints; do
[ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
@@ -29,7 +29,7 @@ Author: Thibaut Gridel <tgridel at free.fr>
--- routino-2.1.1.orig/src/test/start-1-finish.sh
+++ routino-2.1.1/src/test/start-1-finish.sh
-@@ -73,8 +73,8 @@ for waypoint in $waypoints; do
+@@ -87,8 +87,8 @@ for waypoint in $waypoints; do
[ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
@@ -40,34 +40,3 @@ Author: Thibaut Gridel <tgridel at free.fr>
mv shortest* $dir/$name-$waypoint
---- routino-2.1.1.orig/web/www/routino/paths.pl
-+++ routino-2.1.1/web/www/routino/paths.pl
-@@ -22,10 +22,10 @@
- # Directory path parameters
-
- # EDIT THIS to set the root directory for the non-web data files.
--$root_dir="../..";
-+$root_dir="/var/lib/routino";
-
- # EDIT THIS to change the location of the individual directories.
--$bin_dir="$root_dir/bin";
-+$bin_dir="/usr/bin";
- $data_dir="$root_dir/data";
- $results_dir="$root_dir/results";
-
-@@ -30,14 +30,14 @@ $data_dir="$root_dir/data";
- $results_dir="$root_dir/results";
-
- # EDIT THIS to set the filename prefix for the routing database files.
- $data_prefix="";
-
- # EDIT THIS to change the names of the executables (enables easy selection of slim mode).
--$router_exe="router";
-+$router_exe="routino-router";
- $filedumper_exe="filedumper";
-
- # EDIT THIS to change the search type and base URL (must be a type recognised by search.pl).
- $search_type="nominatim";
- $search_baseurl="http://nominatim.openstreetmap.org/search";
-
- 1;
diff --git a/debian/patches/install_documentation b/debian/patches/install_documentation
index 176f84b..0e140f3 100644
--- a/debian/patches/install_documentation
+++ b/debian/patches/install_documentation
@@ -1,14 +1,14 @@
Description: Install Documentation
Author: Thibaut Gridel <tgridel at free.fr>
---- routino-2.1.1.orig/doc/Makefile
-+++ routino-2.1.1/doc/Makefile
-@@ -25,7 +25,7 @@ WEBDIR=../web/www/routino/documentation
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -25,7 +25,7 @@
# Files to install
- HTML_FILES=html/*
+ HTML_FILES=$(notdir $(wildcard html/*.html)) $(notdir $(wildcard html/*.css))
-TXT_FILES=*.txt
-+TXT_FILES="ALGORITHM.txt CONFIGURATION.txt DATA.txt NEWS.txt OUTPUT.txt README.txt TAGGING.txt USAGE.txt"
++TXT_FILES="ALGORITHM.txt CONFIGURATION.txt DATA.txt DATALIFE.txt LIMITS.txt NEWS.txt OUTPUT.txt README.txt TAGGING.txt USAGE.txt"
TOP_FILES=../agpl-3.0.txt
########
diff --git a/debian/patches/install_path b/debian/patches/install_path
index 00c48fc..9a28b5c 100644
--- a/debian/patches/install_path
+++ b/debian/patches/install_path
@@ -1,13 +1,11 @@
Description: Installation path changes
Author: Thibaut Gridel <tgridel at free.fr>
-Index: routino/Makefile
-===================================================================
---- routino.orig/Makefile 2012-08-21 07:23:48.000000000 +0200
-+++ routino/Makefile 2012-12-21 21:35:18.000000000 +0100
+--- a/Makefile.conf
++++ b/Makefile.conf
@@ -20,9 +20,9 @@
- # Installation locations
+ # Installation locations (edit if required)
-prefix=/usr/local
+prefix=/usr
@@ -16,4 +14,4 @@ Index: routino/Makefile
+docdir=$(prefix)/share/doc/routino
datadir=$(prefix)/share/routino
- # Sub-directories and sub-makefiles
+
diff --git a/debian/patches/map_bounds b/debian/patches/map_bounds
index b13ac84..2fdb6fb 100644
--- a/debian/patches/map_bounds
+++ b/debian/patches/map_bounds
@@ -24,15 +24,3 @@ Author: Uwe Steinmann <steinm at debian.org>
// EDIT THIS above to change the visible map limits
-@@ -30,6 +30,11 @@
- label: "OSM map",
- baseurl: "http://tile.openstreetmap.org/",
- errorurl: "http://openstreetmap.org/openlayers/img/404.png"
-+ },
-+ {
-+ label: "OSM CycleMap",
-+ baseurl: "http://a.tile.opencyclemap.org/cycle/",
-+ errorurl: "http://openstreetmap.org/openlayers/img/404.png"
- }
- ],
-
diff --git a/debian/patches/maploader b/debian/patches/maploader
new file mode 100644
index 0000000..306a591
--- /dev/null
+++ b/debian/patches/maploader
@@ -0,0 +1,23 @@
+Description: Use local installation of leaflet or openlayers
+Author: Uwe Steinmann <steinm at debian.org>
+
+--- a/web/www/routino/maploader.js
++++ b/web/www/routino/maploader.js
+@@ -47,14 +47,14 @@
+
+ if(mapprops.library == "leaflet")
+ {
+- load_css("../leaflet/leaflet.css");
+- load_js("../leaflet/leaflet.js");
++ load_css("/javascript/leaflet/leaflet.css");
++ load_js("/javascript/leaflet/leaflet.js");
+
+ load_js(location.pathname.replace(/\.html.*/,".leaflet.js"));
+ }
+ else
+ {
+- load_js("../openlayers/OpenLayers.js");
++ load_js("/javascript/openlayers/OpenLayers.js");
+
+ load_js(location.pathname.replace(/\.html.*/,".openlayers.js"));
+ }
diff --git a/debian/patches/mapprops b/debian/patches/mapprops
new file mode 100644
index 0000000..14bc365
--- /dev/null
+++ b/debian/patches/mapprops
@@ -0,0 +1,56 @@
+Description: Add additional layer for OpenCycleMap
+Author: Uwe Steinmann <steinm at debian.org>
+
+--- a/web/www/routino/mapprops.js
++++ b/web/www/routino/mapprops.js
+@@ -6,22 +6,22 @@
+
+ // EDIT THIS below to change the map library (either 'openlayers' or 'leaflet').
+
+- library: "openlayers",
+- //library: "leaflet",
++ //library: "openlayers",
++ library: "leaflet",
+
+ // EDIT THIS above to change the map library (either 'openlayers' or 'leaflet').
+
+
+ // EDIT THIS below to change the visible map limits
+
+- westedge: -11.0, // Minimum longitude (degrees)
+- eastedge: 2.0, // Maximum longitude (degrees)
++ westedge: -180.0, // Minimum longitude (degrees)
++ eastedge: 180.0, // Maximum longitude (degrees)
+
+- southedge: 49.5, // Minimum latitude (degrees)
+- northedge: 61.0, // Maximum latitude (degrees)
++ southedge: -80.0, // Minimum latitude (degrees)
++ northedge: 80.0, // Maximum latitude (degrees)
+
+- zoomout: 4, // Minimum zoom
+- zoomin: 15, // Maximum zoom
++ zoomout: 2, // Minimum zoom
++ zoomin: 16, // Maximum zoom
+
+ // EDIT THIS above to change the visible map limits
+
+@@ -54,6 +54,19 @@
+ tile_url: "http://www.mapquest.com/",
+ tile_text: "© MapQuest <img src=\"http://developer.mapquest.com/content/osm/mq_logo.png\">"
+ }
++ },
++ {
++ label: "OSM CycleMap",
++ tiles: {
++ url: "http://${s}.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png",
++ subdomains: ["a","b","c"]
++ },
++ attribution: {
++ data_url: "http://www.openstreetmap.org/copyright",
++ data_text: "© OpenStreetMap contributors",
++ tile_url: "http://www.openstreetmap.org/copyright",
++ tile_text: "© OpenStreetMap"
++ }
+ }
+ ],
+
diff --git a/debian/patches/rename_router b/debian/patches/rename_router
index c699540..ae0e401 100644
--- a/debian/patches/rename_router
+++ b/debian/patches/rename_router
@@ -1,18 +1,18 @@
Description: Rename router binaries
Author: Thibaut Gridel <tgridel at free.fr>
---- routino/src/Makefile 2012-12-21 21:34:27.000000000 +0100
-+++ routino/src/Makefile 2012-12-21 22:02:46.000000000 +0100
-@@ -60,7 +60,7 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -41,7 +41,7 @@
C=$(wildcard *.c)
D=$(wildcard .deps/*.d)
--EXE=planetsplitter planetsplitter-slim router router-slim filedumperx filedumper filedumper-slim tagmodifier
-+EXE=planetsplitter planetsplitter-slim routino-router routino-router-slim filedumperx filedumper filedumper-slim tagmodifier
+-EXE=planetsplitter planetsplitter-slim router router-slim filedumperx filedumper filedumper-slim
++EXE=planetsplitter planetsplitter-slim routino-router routino-router-slim filedumperx filedumper filedumper-slim
########
-@@ -107,7 +107,7 @@
+@@ -86,7 +86,7 @@
files.o logging.o profiles.o xmlparse.o \
results.o queue.o translations.o
@@ -21,7 +21,7 @@ Author: Thibaut Gridel <tgridel at free.fr>
$(LD) $(ROUTER_OBJ) -o $@ $(LDFLAGS)
########
-@@ -118,7 +118,7 @@
+@@ -97,7 +97,7 @@
files.o logging.o profiles.o xmlparse.o \
results.o queue.o translations.o
@@ -30,3 +30,14 @@ Author: Thibaut Gridel <tgridel at free.fr>
$(LD) $(ROUTER_SLIM_OBJ) -o $@ $(LDFLAGS)
########
+--- a/web/Makefile
++++ b/web/Makefile
+@@ -51,7 +51,7 @@
+ DOC_FILES=$(notdir $(wildcard $(DOCDIR)/html/*.html)) $(notdir $(wildcard $(DOCDIR)/html/*.css))
+
+ EXE_FILES=planetsplitter planetsplitter-slim \
+- router router-slim \
++ routino-router routino-router-slim \
+ filedumper filedumper-slim \
+ filedumperx
+
diff --git a/debian/patches/series b/debian/patches/series
index 0b10a16..6a3ef0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
install_path
rename_router
fix_tests
-use_openlayers
-map_bounds
+web_path
install_documentation
+maploader
+mapprops
diff --git a/debian/patches/web_path b/debian/patches/web_path
new file mode 100644
index 0000000..2cf1ed5
--- /dev/null
+++ b/debian/patches/web_path
@@ -0,0 +1,34 @@
+Description: Fix for wrong paths in web app
+Author: Uwe Steinmann <uwe at steinmann.cx>
+
+--- routino-2.1.1.orig/web/www/routino/paths.pl
++++ routino-2.1.1/web/www/routino/paths.pl
+@@ -22,10 +22,10 @@
+ # Directory path parameters
+
+ # EDIT THIS to set the root directory for the non-web data files.
+-$root_dir="../..";
++$root_dir="/var/lib/routino";
+
+ # EDIT THIS to change the location of the individual directories.
+-$bin_dir="$root_dir/bin";
++$bin_dir="/usr/bin";
+ $data_dir="$root_dir/data";
+ $results_dir="$root_dir/results";
+
+@@ -30,14 +30,14 @@ $data_dir="$root_dir/data";
+ $results_dir="$root_dir/results";
+
+ # EDIT THIS to set the filename prefix for the routing database files.
+ $data_prefix="";
+
+ # EDIT THIS to change the names of the executables (enables easy selection of slim mode).
+-$router_exe="router";
++$router_exe="routino-router";
+ $filedumper_exe="filedumper";
+
+ # EDIT THIS to change the search type and base URL (must be a type recognised by search.pl).
+ $search_type="nominatim";
+ $search_baseurl="http://nominatim.openstreetmap.org/search";
+
+ 1;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/routino.git
More information about the Pkg-grass-devel
mailing list