[SCM] routino branch, master, updated. 0208b8be5079986a90a0980c09593849155d168c

[Thibaut Gridel]

The following commit has been merged in the master branch:
commit a19774659b1aefb226fb3dd8c0cc8647f2692fbf
Author: Thibaut Gridel <tgridel at free.fr>
Date:   Wed Oct 26 22:27:48 2011 +0200

    Fixing tests

diff --git a/debian/patches/fix_tests b/debian/patches/fix_tests
new file mode 100644
index 0000000..911076b
--- /dev/null
+++ b/debian/patches/fix_tests
@@ -0,0 +1,53 @@
+Description: Fix for Tests
+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
+ 
+     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
+ 
+-    echo ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
+-    $debugger ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
++    echo ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
++    $debugger ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
+ 
+     mv shortest* $dir/$name-$waypoint
+ 
+--- 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
+ 
+     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
+ 
+-    echo ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
+-    $debugger ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
++    echo ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
++    $debugger ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
+ 
+     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
+@@ -73,8 +73,8 @@ for waypoint in $waypoints; do
+ 
+     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
+ 
+-    echo ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
+-    $debugger ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
++    echo ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
++    $debugger ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
+ 
+     mv shortest* $dir/$name-$waypoint
+ 
+--- routino-2.1.1.orig/web/www/routino/paths.pl
++++ routino-2.1.1/web/www/routino/paths.pl
+@@ -30,7 +30,7 @@ $data_dir="$root_dir/data";
+ $results_dir="$root_dir/results";
+ 
+ # 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";
+ 
+ 1;
diff --git a/debian/patches/series b/debian/patches/series
index 5f9c716..edd41ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 install_path
 rename_router
+fix_tests

-- 
Packaging for routino