This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository routino.
commit aa39a1d3fc73e1f9b473b5a1612bab29b0bf21b1 Author: Bas Couwenberg <[email protected]> Date: Fri Feb 6 22:08:13 2015 +0100 Refresh patches. --- debian/patches/fix_tests | 12 ++++++------ debian/patches/install_documentation | 2 +- debian/patches/maploader | 4 ++-- debian/patches/mapprops | 4 ++-- debian/patches/rename_router | 10 +++++----- debian/patches/web_path | 15 ++++----------- 6 files changed, 20 insertions(+), 27 deletions(-) diff --git a/debian/patches/fix_tests b/debian/patches/fix_tests index 5c15464..6ef7f91 100644 --- a/debian/patches/fix_tests +++ b/debian/patches/fix_tests @@ -1,8 +1,8 @@ Description: Fix for Tests Author: Thibaut Gridel <[email protected]> ---- routino-2.1.1.orig/src/test/a-b-c.sh -+++ routino-2.1.1/src/test/a-b-c.sh +--- a/src/test/a-b-c.sh ++++ b/src/test/a-b-c.sh @@ -88,8 +88,8 @@ for waypoint in $waypoints; do [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint @@ -14,8 +14,8 @@ Author: Thibaut Gridel <[email protected]> mv shortest* $dir/$name-$waypoint ---- routino-2.1.1.orig/src/test/a-b.sh -+++ routino-2.1.1/src/test/a-b.sh +--- a/src/test/a-b.sh ++++ b/src/test/a-b.sh @@ -87,8 +87,8 @@ for waypoint in $waypoints; do [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint @@ -27,8 +27,8 @@ Author: Thibaut Gridel <[email protected]> mv shortest* $dir/$name-$waypoint ---- routino-2.1.1.orig/src/test/start-1-finish.sh -+++ routino-2.1.1/src/test/start-1-finish.sh +--- a/src/test/start-1-finish.sh ++++ b/src/test/start-1-finish.sh @@ -87,8 +87,8 @@ for waypoint in $waypoints; do [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint diff --git a/debian/patches/install_documentation b/debian/patches/install_documentation index 0e140f3..8732f48 100644 --- a/debian/patches/install_documentation +++ b/debian/patches/install_documentation @@ -3,7 +3,7 @@ Author: Thibaut Gridel <[email protected]> --- a/doc/Makefile +++ b/doc/Makefile -@@ -25,7 +25,7 @@ +@@ -25,7 +25,7 @@ include ../Makefile.conf # Files to install HTML_FILES=$(notdir $(wildcard html/*.html)) $(notdir $(wildcard html/*.css)) diff --git a/debian/patches/maploader b/debian/patches/maploader index 2f2d226..938fa19 100644 --- a/debian/patches/maploader +++ b/debian/patches/maploader @@ -3,7 +3,7 @@ Author: Uwe Steinmann <[email protected]> --- a/web/www/routino/maploader.js +++ b/web/www/routino/maploader.js -@@ -47,14 +47,14 @@ +@@ -47,14 +47,14 @@ function map_load(callbacks) if(mapprops.library == "leaflet") { @@ -23,7 +23,7 @@ Author: Uwe Steinmann <[email protected]> } --- a/web/www/routino/router.leaflet.js +++ b/web/www/routino/router.leaflet.js -@@ -744,6 +744,8 @@ +@@ -746,6 +746,8 @@ function map_init() // calle maxBounds: L.latLngBounds(L.latLng(mapprops.southedge,mapprops.westedge),L.latLng(mapprops.northedge,mapprops.eastedge)) }); diff --git a/debian/patches/mapprops b/debian/patches/mapprops index 14bc365..570e3f9 100644 --- a/debian/patches/mapprops +++ b/debian/patches/mapprops @@ -3,7 +3,7 @@ Author: Uwe Steinmann <[email protected]> --- a/web/www/routino/mapprops.js +++ b/web/www/routino/mapprops.js -@@ -6,22 +6,22 @@ +@@ -6,22 +6,22 @@ var mapprops={ // contains all propertie // EDIT THIS below to change the map library (either 'openlayers' or 'leaflet'). @@ -34,7 +34,7 @@ Author: Uwe Steinmann <[email protected]> // EDIT THIS above to change the visible map limits -@@ -54,6 +54,19 @@ +@@ -54,6 +54,19 @@ var mapprops={ // contains all propertie tile_url: "http://www.mapquest.com/";, tile_text: "© MapQuest <img src=\"http://developer.mapquest.com/content/osm/mq_logo.png\";>" } diff --git a/debian/patches/rename_router b/debian/patches/rename_router index 3629383..b907541 100644 --- a/debian/patches/rename_router +++ b/debian/patches/rename_router @@ -3,7 +3,7 @@ Author: Thibaut Gridel <[email protected]> --- a/src/Makefile +++ b/src/Makefile -@@ -41,7 +41,7 @@ +@@ -41,7 +41,7 @@ SUBDIRS=$(foreach f,$(SUBFILES),$(dir $f C=$(wildcard *.c) D=$(wildcard .deps/*.d) @@ -12,7 +12,7 @@ Author: Thibaut Gridel <[email protected]> ######## -@@ -86,7 +86,7 @@ +@@ -86,7 +86,7 @@ ROUTER_OBJ=router.o \ files.o logging.o profiles.o xmlparse.o \ results.o queue.o translations.o @@ -21,7 +21,7 @@ Author: Thibaut Gridel <[email protected]> $(LD) $(ROUTER_OBJ) -o $@ $(LDFLAGS) ######## -@@ -97,7 +97,7 @@ +@@ -97,7 +97,7 @@ ROUTER_SLIM_OBJ=router-slim.o \ files.o logging.o profiles.o xmlparse.o \ results.o queue.o translations.o @@ -32,7 +32,7 @@ Author: Thibaut Gridel <[email protected]> ######## --- a/web/Makefile +++ b/web/Makefile -@@ -51,7 +51,7 @@ +@@ -53,7 +53,7 @@ TRANS_FILES=$(wildcard $(WEBTRANSDIR)/tr DOC_FILES=$(notdir $(wildcard $(DOCDIR)/html/*.html)) $(notdir $(wildcard $(DOCDIR)/html/*.css)) EXE_FILES=planetsplitter planetsplitter-slim \ @@ -43,7 +43,7 @@ Author: Thibaut Gridel <[email protected]> --- a/src/test/Makefile +++ b/src/test/Makefile -@@ -25,7 +25,7 @@ +@@ -25,7 +25,7 @@ include ../../Makefile.conf # executables ROUTINO_EXE=../planetsplitter ../planetsplitter-slim \ diff --git a/debian/patches/web_path b/debian/patches/web_path index 2cf1ed5..88caadd 100644 --- a/debian/patches/web_path +++ b/debian/patches/web_path @@ -1,8 +1,8 @@ Description: Fix for wrong paths in web app Author: Uwe Steinmann <[email protected]> ---- routino-2.1.1.orig/web/www/routino/paths.pl -+++ routino-2.1.1/web/www/routino/paths.pl +--- a/web/www/routino/paths.pl ++++ b/web/www/routino/paths.pl @@ -22,10 +22,10 @@ # Directory path parameters @@ -15,20 +15,13 @@ Author: Uwe Steinmann <[email protected]> +$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. +@@ -33,7 +33,7 @@ $results_dir="$root_dir/results"; $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 _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
![http://developer.mapquest.com/content/osm/mq_logo.png\"](http://developer.mapquest.com/content/osm/mq_logo.png\"){kind=link}