[routino] 07/13: Refresh patches, mark as Forwarded: not-needed.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Sep 13 22:33:07 UTC 2015 

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

sebastic pushed a commit to branch master
in repository routino.

commit 5e8dd78b4de9ac98c30a53016e75384624584c40
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 13 15:17:35 2015 +0200

    Refresh patches, mark as Forwarded: not-needed.
---
 debian/changelog                     |  1 +
 debian/patches/fix_tests             | 57 +++++++++++++++++++--------
 debian/patches/hardening             | 10 ++---
 debian/patches/install_documentation |  1 +
 debian/patches/install_path          | 11 ++++--
 debian/patches/map_bounds            |  1 +
 debian/patches/maploader             |  3 +-
 debian/patches/mapprops              |  1 +
 debian/patches/rename_router         | 75 ++++++++++++++++++++++--------------
 debian/patches/use_openlayers        |  1 +
 debian/patches/web_path              |  1 +
 11 files changed, 109 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b970d44..8e03307 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ routino (3.0-1) UNRELEASED; urgency=medium
     - Add license & copyright for mman-win32.{c,h}
   * Update Vcs-Browser URL to use HTTPS.
   * Override dh_install to use --list-missing.
+  * Refresh patches, mark as Forwarded: not-needed.
 
  -- 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
index 6ef7f91..031e279 100644
--- a/debian/patches/fix_tests
+++ b/debian/patches/fix_tests
@@ -1,42 +1,69 @@
 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
-@@ -88,8 +88,8 @@ for waypoint in $waypoints; do
+@@ -105,8 +105,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
+-    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
-@@ -87,8 +87,8 @@ for waypoint in $waypoints; do
+@@ -104,8 +104,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
+-    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
-@@ -87,8 +87,8 @@ for waypoint in $waypoints; do
+@@ -104,8 +104,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
+-    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/hardening b/debian/patches/hardening
index f1e0f9e..778c40e 100644
--- a/debian/patches/hardening
+++ b/debian/patches/hardening
@@ -1,9 +1,10 @@
 Description: Use hardening flags in Makefile.conf.
 Author: Bas Couwenberg <sebastic at xs4all.nl>
+Forwarded: not-needed
 
 --- a/Makefile.conf
 +++ b/Makefile.conf
-@@ -31,7 +31,6 @@ datadir=$(prefix)/share/routino
+@@ -65,7 +65,6 @@ endif
  CC=gcc
  LD=gcc
  
@@ -11,13 +12,12 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
  # Language dialect selection
  CFLAGS=-std=c99
  
-@@ -79,3 +78,9 @@ CFLAGS+=-D_FILE_OFFSET_BITS=64
- 
+@@ -131,3 +130,8 @@ ifneq ($(HOST),MINGW)
  # Required to compile on Linux without a warning about pread() and pwrite() functions.
  CFLAGS+=-D_POSIX_C_SOURCE=200809L
-+
+ endif
 +
 +# Hardening flags
-+CFLAGS+=-fstack-protector-strong -Wformat -Werror=format-security
++CFLAGS+=-g -fstack-protector-strong -Wformat -Werror=format-security
 +CFLAGS+=-D_FORTIFY_SOURCE=2
 +LDFLAGS+=-Wl,-z,relro
diff --git a/debian/patches/install_documentation b/debian/patches/install_documentation
index 8732f48..becefcd 100644
--- a/debian/patches/install_documentation
+++ b/debian/patches/install_documentation
@@ -1,5 +1,6 @@
 Description: Install Documentation
 Author: Thibaut Gridel <tgridel at free.fr>
+Forwarded: not-needed
 
 --- a/doc/Makefile
 +++ b/doc/Makefile
diff --git a/debian/patches/install_path b/debian/patches/install_path
index 9a28b5c..c21f5ff 100644
--- a/debian/patches/install_path
+++ b/debian/patches/install_path
@@ -1,17 +1,20 @@
 Description: Installation path changes
 Author: Thibaut Gridel <tgridel at free.fr> 
+Forwarded: not-needed
 
 --- a/Makefile.conf
 +++ b/Makefile.conf
-@@ -20,9 +20,9 @@
- 
+@@ -45,11 +45,11 @@ endif
  # Installation locations (edit if required)
  
+ ifneq ($(HOST),MINGW)
 -prefix=/usr/local
 +prefix=/usr
  bindir=$(prefix)/bin
+ incdir=$(prefix)/include
+ libdir=$(prefix)/lib
 -docdir=$(prefix)/doc/routino
 +docdir=$(prefix)/share/doc/routino
  datadir=$(prefix)/share/routino
- 
- 
+ else
+ prefix="c:/Program Files/Routino"
diff --git a/debian/patches/map_bounds b/debian/patches/map_bounds
index 2fdb6fb..c3150b9 100644
--- a/debian/patches/map_bounds
+++ b/debian/patches/map_bounds
@@ -1,5 +1,6 @@
 Description: Enlarge bounds of visible map to world
 Author: Uwe Steinmann <steinm at debian.org>
+Forwarded: not-needed
 
 --- a/web/www/routino/mapprops.js
 +++ b/web/www/routino/mapprops.js
diff --git a/debian/patches/maploader b/debian/patches/maploader
index 938fa19..ab888d3 100644
--- a/debian/patches/maploader
+++ b/debian/patches/maploader
@@ -1,5 +1,6 @@
 Description: Use local installation of leaflet or openlayers
 Author: Uwe Steinmann <steinm at debian.org>
+Forwarded: not-needed
 
 --- a/web/www/routino/maploader.js
 +++ b/web/www/routino/maploader.js
@@ -23,7 +24,7 @@ Author: Uwe Steinmann <steinm at debian.org>
     }
 --- a/web/www/routino/router.leaflet.js
 +++ b/web/www/routino/router.leaflet.js
-@@ -746,6 +746,8 @@ function map_init()             // calle
+@@ -753,6 +753,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 570e3f9..cb09323 100644
--- a/debian/patches/mapprops
+++ b/debian/patches/mapprops
@@ -1,5 +1,6 @@
 Description: Add additional layer for OpenCycleMap
 Author: Uwe Steinmann <steinm at debian.org>
+Forwarded: not-needed
 
 --- a/web/www/routino/mapprops.js
 +++ b/web/www/routino/mapprops.js
diff --git a/debian/patches/rename_router b/debian/patches/rename_router
index b907541..0327864 100644
--- a/debian/patches/rename_router
+++ b/debian/patches/rename_router
@@ -1,54 +1,73 @@
 Description: Rename router binaries
 Author: Thibaut Gridel <tgridel at free.fr>
+Forwarded: not-needed
 
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -41,7 +41,7 @@ SUBDIRS=$(foreach f,$(SUBFILES),$(dir $f
+@@ -31,9 +31,9 @@ SUBDIRS=xml test
  C=$(wildcard *.c)
  D=$(wildcard .deps/*.d)
  
--EXE=planetsplitter planetsplitter-slim router router-slim filedumperx filedumper filedumper-slim
-+EXE=planetsplitter planetsplitter-slim routino-router routino-router-slim filedumperx filedumper filedumper-slim
+-EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) router$(.EXE) router-slim$(.EXE) \
++EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) routino-router$(.EXE) routino-router-slim$(.EXE) \
+     filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE) \
+-    router+lib$(.EXE) router+lib-slim$(.EXE)
++    routino-router+lib$(.EXE) routino-router+lib-slim$(.EXE)
  
- ########
+ LIB=libroutino.so libroutino-slim.so
  
-@@ -86,7 +86,7 @@ ROUTER_OBJ=router.o \
- 	   files.o logging.o profiles.o xmlparse.o \
- 	   results.o queue.o translations.o
+@@ -100,7 +100,7 @@ ifeq ($(HOST),MINGW)
+ ROUTER_OBJ+=mman-win32.o
+ endif
  
--router : $(ROUTER_OBJ)
-+routino-router : $(ROUTER_OBJ)
- 	$(LD) $(ROUTER_OBJ) -o $@ $(LDFLAGS)
+-router$(.EXE) : $(ROUTER_OBJ)
++routino-router$(.EXE) : $(ROUTER_OBJ)
+ 	$(LD) $^ -o $@ $(LDFLAGS)
  
  ########
-@@ -97,7 +97,7 @@ ROUTER_SLIM_OBJ=router-slim.o \
- 	        files.o logging.o profiles.o xmlparse.o \
- 	        results.o queue.o translations.o
+@@ -115,7 +115,7 @@ ifeq ($(HOST),MINGW)
+ ROUTER_SLIM_OBJ+=mman-win32.o
+ endif
  
--router-slim : $(ROUTER_SLIM_OBJ)
-+routino-router-slim : $(ROUTER_SLIM_OBJ)
- 	$(LD) $(ROUTER_SLIM_OBJ) -o $@ $(LDFLAGS)
+-router-slim$(.EXE) : $(ROUTER_SLIM_OBJ)
++routino-router-slim$(.EXE) : $(ROUTER_SLIM_OBJ)
+ 	$(LD) $^ -o $@ $(LDFLAGS)
+ 
+ ########
+@@ -172,10 +172,10 @@ filedumper-slim$(.EXE) : $(FILEDUMPER_SL
+ 
+ ROUTER_LIB_OBJ=router+lib.o
+ 
+-router+lib$(.EXE) : $(ROUTER_LIB_OBJ) libroutino.so
++routino-router+lib$(.EXE) : $(ROUTER_LIB_OBJ) libroutino.so
+ 	$(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
+ 
+-router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) libroutino-slim.so
++routino-router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) libroutino-slim.so
+ 	$(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
  
  ########
 --- a/web/Makefile
 +++ b/web/Makefile
-@@ -53,7 +53,7 @@ TRANS_FILES=$(wildcard $(WEBTRANSDIR)/tr
+@@ -52,7 +52,7 @@ TRANS_FILES=$(wildcard $(WEBTRANSDIR)/tr
+ 
  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
+-EXE_FILES=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) router$(.EXE) router-slim$(.EXE) filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE)
++EXE_FILES=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) routino-router$(.EXE) routino-router-slim$(.EXE) filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE)
+ 
+ ########
  
 --- a/src/test/Makefile
 +++ b/src/test/Makefile
-@@ -25,7 +25,7 @@ include ../../Makefile.conf
+@@ -25,8 +25,8 @@ include ../../Makefile.conf
  # executables
  
- ROUTINO_EXE=../planetsplitter ../planetsplitter-slim \
--            ../router ../router-slim \
-+            ../routino-router ../routino-router-slim \
-             ../filedumper ../filedumper-slim
+ ROUTINO_EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) \
+-            router$(.EXE)         router-slim$(.EXE) \
+-            router+lib$(.EXE)     router+lib-slim$(.EXE) \
++            routino-router$(.EXE)         routino-router-slim$(.EXE) \
++            routino-router+lib$(.EXE)     routino-router+lib-slim$(.EXE) \
+             filedumper$(.EXE)     filedumper-slim$(.EXE)
  
- EXE=is-fast-math
+ EXE=is-fast-math$(.EXE)
diff --git a/debian/patches/use_openlayers b/debian/patches/use_openlayers
index 9b59563..6e371d1 100644
--- a/debian/patches/use_openlayers
+++ b/debian/patches/use_openlayers
@@ -1,5 +1,6 @@
 Description: use installed openlayers form libjs-openlayers
 Author: Thibaut Gridel <tgridel at free.fr>
+Forwarded: not-needed
 
 --- routino-2.1.1.orig/web/www/routino/router.html.en
 +++ routino-2.1.1/web/www/routino/router.html.en
diff --git a/debian/patches/web_path b/debian/patches/web_path
index 88caadd..78c5d30 100644
--- a/debian/patches/web_path
+++ b/debian/patches/web_path
@@ -1,5 +1,6 @@
 Description: Fix for wrong paths in web app
 Author: Uwe Steinmann <uwe at steinmann.cx>
+Forwarded: not-needed
 
 --- a/web/www/routino/paths.pl
 +++ b/web/www/routino/paths.pl

-- 
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