ǝɹʇʇɐʃǝ◖ xıʃǝɟ pushed to branch master at Debian GIS Project / tilemaker
Commits: ce2deabc by Felix Delattre at 2021-09-03T13:29:11+00:00 Improve passing of version to build process. - - - - - 2 changed files: - debian/patches/0002-Avoid-calling-git-outside-of-repository.patch - debian/patches/0003-Add-man-page-for-tilemaker.patch Changes: ===================================== debian/patches/0002-Avoid-calling-git-outside-of-repository.patch ===================================== @@ -9,7 +9,7 @@ Bug: https://github.com/systemed/tilemaker/pull/298 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 7316325..32e4c1b 100644 +index 7316325..572607b 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,9 @@ endif @@ -17,9 +17,9 @@ index 7316325..32e4c1b 100644 prefix = /usr/local -TM_VERSION := $(shell git describe --tags --abbrev=0) -+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') -+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) -+TM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') ++DEB_VERSION := $(shell dpkg-parsechangelog -SVersion) ++DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//') ++TM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed -e 's/^[0-9]*://') CXXFLAGS := -O3 -Wall -Wno-unknown-pragmas -Wno-sign-compare -std=c++14 -pthread -fPIE -DTM_VERSION=$(TM_VERSION) $(CONFIG) LIB := -L/usr/local/lib -lz $(LUA_LIBS) -lboost_program_options -lsqlite3 -lboost_filesystem -lboost_system -lboost_iostreams -lprotobuf -lshp INC := -I/usr/local/include -isystem ./include -I./src $(LUA_CFLAGS) ===================================== debian/patches/0003-Add-man-page-for-tilemaker.patch ===================================== @@ -11,7 +11,7 @@ Bug: https://github.com/systemed/tilemaker/pull/299 create mode 100644 docs/man/tilemaker.1 diff --git a/Makefile b/Makefile -index 32e4c1b..5b6aa70 100644 +index 572607b..c1d2579 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ endif @@ -20,9 +20,9 @@ index 32e4c1b..5b6aa70 100644 prefix = /usr/local - +MANPREFIX := /usr/share/man - DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') - DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) - TM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') + DEB_VERSION := $(shell dpkg-parsechangelog -SVersion) + DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//') + TM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed -e 's/^[0-9]*://') @@ -90,6 +90,8 @@ tilemaker: include/osmformat.pb.o include/vector_tile.pb.o src/mbtiles.o src/pbf install: install -m 0755 -d $(DESTDIR)$(prefix)/bin/ View it on GitLab: https://salsa.debian.org/debian-gis-team/tilemaker/-/commit/ce2deabc96d77eb8c1ec55b0c0a7a2c9a272673f -- View it on GitLab: https://salsa.debian.org/debian-gis-team/tilemaker/-/commit/ce2deabc96d77eb8c1ec55b0c0a7a2c9a272673f You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
