[routino] 09/11: Drop patches applied upstream. Refresh remaining patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Mar 6 14:19:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository routino.
commit 714f37b7a6c1dcf357d4c6a6f0faca6455adfa12
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Mar 6 14:21:55 2016 +0100
Drop patches applied upstream. Refresh remaining patches.
---
debian/changelog | 1 +
debian/patches/hardening | 2 +-
debian/patches/maploader | 2 +-
...1801-Dont-create-the-.so-files-on-Windows.patch | 42 -------
...dd-a-SONAME-shared-library-version-number.patch | 123 ---------------------
debian/patches/rename_router | 23 +---
debian/patches/series | 2 -
debian/patches/web_path | 2 +-
8 files changed, 9 insertions(+), 188 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1f7582c..7b26550 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ routino (3.1-1) UNRELEASED; urgency=medium
* Bump Standards-Version to 3.9.7, no changes.
* Enable parallel builds.
* Update watch file to handle common issues.
+ * Drop patches applied upstream. Refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Sun, 06 Mar 2016 14:04:02 +0100
diff --git a/debian/patches/hardening b/debian/patches/hardening
index 22e716f..7d2f45d 100644
--- a/debian/patches/hardening
+++ b/debian/patches/hardening
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/Makefile.conf
+++ b/Makefile.conf
-@@ -144,3 +144,8 @@ ifneq ($(HOST),MINGW)
+@@ -151,3 +151,8 @@ ifneq ($(HOST),MINGW)
# Required to compile on Linux without a warning about pread() and pwrite() functions.
CFLAGS+=-D_POSIX_C_SOURCE=200809L
endif
diff --git a/debian/patches/maploader b/debian/patches/maploader
index ab888d3..181fdd7 100644
--- a/debian/patches/maploader
+++ b/debian/patches/maploader
@@ -24,7 +24,7 @@ Forwarded: not-needed
}
--- a/web/www/routino/router.leaflet.js
+++ b/web/www/routino/router.leaflet.js
-@@ -753,6 +753,8 @@ function map_init() // calle
+@@ -791,6 +791,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/r1801-Dont-create-the-.so-files-on-Windows.patch b/debian/patches/r1801-Dont-create-the-.so-files-on-Windows.patch
deleted file mode 100644
index eda0da9..0000000
--- a/debian/patches/r1801-Dont-create-the-.so-files-on-Windows.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Don't create the *.so files on Windows.
-Author: Andrew M. Bishop <amb at gedanken.org.uk>
-Origin: http://www.routino.org/viewvc?view=revision&revision=1801
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -35,10 +35,10 @@ EXE=planetsplitter$(.EXE) planetsplitter
- filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE) \
- router+lib$(.EXE) router+lib-slim$(.EXE)
-
-+ifneq ($(HOST),MINGW)
- LIB=libroutino.so libroutino-slim.so
--
--ifeq ($(HOST),MINGW)
--LIB+=routino.dll routino-slim.dll
-+else
-+LIB =routino.dll routino-slim.dll
- LIB+=routino.def routino-slim.def
- LIB+=routino.lib routino-slim.lib
- endif
-@@ -193,8 +193,8 @@ endif
- libroutino.so : $(LIBROUTINO_OBJ)
- $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
-
--routino.dll : libroutino.so
-- cp $< $@
-+libroutino.dll : $(LIBROUTINO_OBJ)
-+ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
-
- routino.def : routino-lib.o
- dlltool -v --output-def $@ $<
-@@ -217,8 +217,8 @@ endif
- libroutino-slim.so : $(LIBROUTINO_SLIM_OBJ)
- $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
-
--routino-slim.dll : libroutino-slim.so
-- cp $< $@
-+libroutino-slim.dll : $(LIBROUTINO_SLIM_OBJ)
-+ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
-
- routino-slim.def : routino-slim-lib.o
- dlltool -v --output-def $@ $<
diff --git a/debian/patches/r1803-Add-a-SONAME-shared-library-version-number.patch b/debian/patches/r1803-Add-a-SONAME-shared-library-version-number.patch
deleted file mode 100644
index f9c2920..0000000
--- a/debian/patches/r1803-Add-a-SONAME-shared-library-version-number.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-Description: Add a "SONAME" shared library version number.
-Author: Andrew M. Bishop <amb at gedanken.org.uk>
-Origin: http://www.routino.org/viewvc?view=revision&revision=1803
-
---- a/Makefile.conf
-+++ b/Makefile.conf
-@@ -61,6 +61,13 @@ datadir=$(prefix)/xml
- endif
-
-
-+# Library version for ABI compatibility
-+SOVERSION=0
-+
-+# Full library version (SOVERSION.MINOR[.RELEASE])
-+LIBVERSION=$(SOVERSION).0.0
-+
-+
- # Compilation programs
- CC=gcc
- LD=gcc
-@@ -97,6 +104,12 @@ CFLAGS_LIB+=-fPIC
- LDFLAGS_LIB+=-fPIC
- endif
-
-+ifeq ($(HOST),UNIX)
-+# Extra flags for compiling libroutino shared library (SONAME)
-+LDFLAGS_SONAME=-Wl,-soname=libroutino.so.$(SOVERSION)
-+LDFLAGS_SLIM_SONAME=-Wl,-soname=libroutino-slim.so.$(SOVERSION)
-+endif
-+
- # Put the current directory in the shared library path for the router using libroutino
- LDFLAGS_LDSO=-Wl,-R.
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -36,7 +36,9 @@ EXE=planetsplitter$(.EXE) planetsplitter
- router+lib$(.EXE) router+lib-slim$(.EXE)
-
- ifneq ($(HOST),MINGW)
--LIB=libroutino.so libroutino-slim.so
-+LIB =libroutino.so libroutino-slim.so
-+LIB+=libroutino.so.$(SOVERSION) libroutino-slim.so.$(SOVERSION)
-+LIB+=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
- else
- LIB =routino.dll routino-slim.dll
- LIB+=routino.def routino-slim.def
-@@ -45,6 +47,14 @@ endif
-
- INC=routino.h
-
-+ifneq ($(HOST),MINGW)
-+LINK_LIB=libroutino.so
-+LINK_SLIM_LIB=libroutino-slim.so
-+else
-+LINK_LIB=routino.dll
-+LINK_SLIM_LIB=routino-slim.dll
-+endif
-+
- ########
-
- all: all-local
-@@ -172,10 +182,10 @@ filedumper-slim$(.EXE) : $(FILEDUMPER_SL
-
- ROUTER_LIB_OBJ=router+lib.o
-
--router+lib$(.EXE) : $(ROUTER_LIB_OBJ) libroutino.so
-+router+lib$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_LIB)
- $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
-
--router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) libroutino-slim.so
-+router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_SLIM_LIB)
- $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
-
- ########
-@@ -190,10 +200,16 @@ ifeq ($(HOST),MINGW)
- LIBROUTINO_OBJ+=mman-win32.o
- endif
-
--libroutino.so : $(LIBROUTINO_OBJ)
-- $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
-+libroutino.so.$(LIBVERSION) : $(LIBROUTINO_OBJ)
-+ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB) $(LDFLAGS_SONAME)
-
--libroutino.dll : $(LIBROUTINO_OBJ)
-+libroutino.so.$(SOVERSION) : libroutino.so.$(LIBVERSION)
-+ ln -sf $< $@
-+
-+libroutino.so : libroutino.so.$(LIBVERSION)
-+ ln -sf $< $@
-+
-+routino.dll : $(LIBROUTINO_OBJ)
- $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
-
- routino.def : routino-lib.o
-@@ -214,10 +230,16 @@ ifeq ($(HOST),MINGW)
- LIBROUTINO_SLIM_OBJ+=mman-win32.o
- endif
-
--libroutino-slim.so : $(LIBROUTINO_SLIM_OBJ)
-- $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
-+libroutino-slim.so.$(LIBVERSION) : $(LIBROUTINO_SLIM_OBJ)
-+ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB) $(LDFLAGS_SLIM_SONAME)
-+
-+libroutino-slim.so.$(SOVERSION) : libroutino-slim.so.$(LIBVERSION)
-+ ln -sf $< $@
-+
-+libroutino-slim.so : libroutino-slim.so.$(LIBVERSION)
-+ ln -sf $< $@
-
--libroutino-slim.dll : $(LIBROUTINO_SLIM_OBJ)
-+routino-slim.dll : $(LIBROUTINO_SLIM_OBJ)
- $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
-
- routino-slim.def : routino-slim-lib.o
-@@ -271,7 +293,7 @@ install-local: all-local
- @for file in $(LIB); do \
- if [ -f $$file ]; then \
- echo cp $$file $(DESTDIR)$(libdir) ;\
-- cp -f $$file $(DESTDIR)$(libdir) ;\
-+ cp -df $$file $(DESTDIR)$(libdir) ;\
- fi ;\
- done
-
diff --git a/debian/patches/rename_router b/debian/patches/rename_router
index 41ec79b..d31f5b8 100644
--- a/debian/patches/rename_router
+++ b/debian/patches/rename_router
@@ -4,9 +4,9 @@ Forwarded: not-needed
--- a/src/Makefile
+++ b/src/Makefile
-@@ -31,9 +31,9 @@ SUBDIRS=xml test
+@@ -33,9 +33,9 @@ DEPDIR=.deps
C=$(wildcard *.c)
- D=$(wildcard .deps/*.d)
+ D=$(wildcard $(DEPDIR)/*.d)
-EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) router$(.EXE) router-slim$(.EXE) \
+EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) routino-router$(.EXE) routino-router-slim$(.EXE) \
@@ -16,7 +16,7 @@ Forwarded: not-needed
ifneq ($(HOST),MINGW)
LIB =libroutino.so libroutino-slim.so
-@@ -110,7 +110,7 @@ ifeq ($(HOST),MINGW)
+@@ -116,7 +116,7 @@ ifeq ($(HOST),MINGW)
ROUTER_OBJ+=mman-win32.o
endif
@@ -25,7 +25,7 @@ Forwarded: not-needed
$(LD) $^ -o $@ $(LDFLAGS)
########
-@@ -125,7 +125,7 @@ ifeq ($(HOST),MINGW)
+@@ -131,7 +131,7 @@ ifeq ($(HOST),MINGW)
ROUTER_SLIM_OBJ+=mman-win32.o
endif
@@ -34,7 +34,7 @@ Forwarded: not-needed
$(LD) $^ -o $@ $(LDFLAGS)
########
-@@ -182,10 +182,10 @@ filedumper-slim$(.EXE) : $(FILEDUMPER_SL
+@@ -188,10 +188,10 @@ filedumper-slim$(.EXE) : $(FILEDUMPER_SL
ROUTER_LIB_OBJ=router+lib.o
@@ -58,19 +58,6 @@ Forwarded: not-needed
########
---- a/src/test/Makefile
-+++ b/src/test/Makefile
-@@ -25,8 +25,8 @@ include ../../Makefile.conf
- # executables
-
- 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)
--- a/src/test/a-b-c.sh
+++ b/src/test/a-b-c.sh
@@ -105,8 +105,8 @@ for waypoint in $waypoints; do
diff --git a/debian/patches/series b/debian/patches/series
index 8dd993f..f5b8201 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-r1801-Dont-create-the-.so-files-on-Windows.patch
-r1803-Add-a-SONAME-shared-library-version-number.patch
install_path
rename_router
web_path
diff --git a/debian/patches/web_path b/debian/patches/web_path
index 23a68c4..4d0c2e8 100644
--- a/debian/patches/web_path
+++ b/debian/patches/web_path
@@ -21,7 +21,7 @@ Forwarded: not-needed
--- a/web/Makefile
+++ b/web/Makefile
-@@ -104,7 +104,7 @@ all-profiles: all-exe all-data
+@@ -104,7 +104,7 @@ all-profiles: all-bin all-data
[ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.pl ] || \
[ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.js ]; then \
echo update-profiles.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