[routino] 03/09: Merge fix_tests patch into rename_router patch.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository routino.

commit ec18c9cba480b6d19d92ceed6037b52e1f92e114
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 15 09:36:02 2015 +0200

    Merge fix_tests patch into rename_router patch.
---
 debian/changelog             |  1 +
 debian/patches/fix_tests     | 69 --------------------------------------------
 debian/patches/rename_router | 65 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 -
 4 files changed, 66 insertions(+), 70 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d913ecc..22c48a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ routino (3.0-1) UNRELEASED; urgency=medium
   * Update email address for upstream author.
   * Add patch to set the SONAME for libroutino{,-slim}.
   * Add symbols files for libroutino{,-slim}.
+  * Merge fix_tests patch into rename_router patch.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 13 Sep 2015 10:47:14 +0200
 
diff --git a/debian/patches/fix_tests b/debian/patches/fix_tests
deleted file mode 100644
index 031e279..0000000
--- a/debian/patches/fix_tests
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Fix for Tests
-Author: Thibaut Gridel <tgridel at free.fr>
-Forwarded: not-needed
-
---- a/src/test/a-b-c.sh
-+++ b/src/test/a-b-c.sh
-@@ -105,8 +105,8 @@ for waypoint in $waypoints; do
- 
-     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
- 
--    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
--    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
-+    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
-+    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
- 
-     mv shortest* $dir/$name-$waypoint
- 
---- a/src/test/a-b.sh
-+++ b/src/test/a-b.sh
-@@ -104,8 +104,8 @@ for waypoint in $waypoints; do
- 
-     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
- 
--    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
--    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
-+    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
-+    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
- 
-     mv shortest* $dir/$name-$waypoint
- 
---- a/src/test/a-b-c-d.sh
-+++ b/src/test/a-b-c-d.sh
-@@ -106,8 +106,8 @@ for waypoint in $waypoints; do
- 
-     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
- 
--    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
--    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
-+    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
-+    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
- 
-     mv shortest* $dir/$name-$waypoint
- 
---- a/src/test/cycle-drive.sh
-+++ b/src/test/cycle-drive.sh
-@@ -106,8 +106,8 @@ for profile in $profiles; do
- 
-     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
- 
--    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
--    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
-+    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
-+    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
- 
-     mv shortest* $dir/$name-$waypoint
- 
---- a/src/test/start-1-finish.sh
-+++ b/src/test/start-1-finish.sh
-@@ -104,8 +104,8 @@ for waypoint in $waypoints; do
- 
-     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
- 
--    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
--    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
-+    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
-+    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
- 
-     mv shortest* $dir/$name-$waypoint
- 
diff --git a/debian/patches/rename_router b/debian/patches/rename_router
index 0327864..cb33728 100644
--- a/debian/patches/rename_router
+++ b/debian/patches/rename_router
@@ -71,3 +71,68 @@ Forwarded: not-needed
              filedumper$(.EXE)     filedumper-slim$(.EXE)
  
  EXE=is-fast-math$(.EXE)
+--- a/src/test/a-b-c.sh
++++ b/src/test/a-b-c.sh
+@@ -105,8 +105,8 @@ for waypoint in $waypoints; do
+ 
+     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
+ 
+-    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
+-    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
++    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
++    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
+ 
+     mv shortest* $dir/$name-$waypoint
+ 
+--- a/src/test/a-b.sh
++++ b/src/test/a-b.sh
+@@ -104,8 +104,8 @@ for waypoint in $waypoints; do
+ 
+     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
+ 
+-    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
+-    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
++    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
++    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
+ 
+     mv shortest* $dir/$name-$waypoint
+ 
+--- a/src/test/a-b-c-d.sh
++++ b/src/test/a-b-c-d.sh
+@@ -106,8 +106,8 @@ for waypoint in $waypoints; do
+ 
+     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
+ 
+-    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
+-    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
++    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
++    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
+ 
+     mv shortest* $dir/$name-$waypoint
+ 
+--- a/src/test/cycle-drive.sh
++++ b/src/test/cycle-drive.sh
+@@ -106,8 +106,8 @@ for profile in $profiles; do
+ 
+     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
+ 
+-    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
+-    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
++    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
++    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
+ 
+     mv shortest* $dir/$name-$waypoint
+ 
+--- a/src/test/start-1-finish.sh
++++ b/src/test/start-1-finish.sh
+@@ -104,8 +104,8 @@ for waypoint in $waypoints; do
+ 
+     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
+ 
+-    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
+-    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
++    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
++    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
+ 
+     mv shortest* $dir/$name-$waypoint
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e16c249..16c2ea2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 install_path
 rename_router
-fix_tests
 web_path
 install_documentation
 maploader

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/routino.git