[Git][debian-gis-team/tilemaker][master] Improve handling of populating version number.

[ǝɹʇʇɐʃǝ◖ xıʃǝɟ (@xamanu)]

ǝɹʇʇɐʃǝ◖ xıʃǝɟ pushed to branch master at Debian GIS Project / tilemaker


Commits:
e8859941 by Felix Delattre at 2021-08-27T20:03:58+00:00
Improve handling of populating version number.

- - - - -


3 changed files:

- debian/patches/0002-Avoid-using-git-with-release.patch → debian/patches/0002-Avoid-calling-git-outside-of-repository.patch
- debian/patches/0003-Add-man-page-for-tilemaker.patch
- debian/patches/series


Changes:

=====================================
debian/patches/0002-Avoid-using-git-with-release.patch → debian/patches/0002-Avoid-calling-git-outside-of-repository.patch
=====================================
@@ -1,22 +1,25 @@
 From: Felix Delattre <felix at delattre.de>
 Date: Fri, 27 Aug 2021 14:55:35 +0000
-Subject: Avoid using git with release
+Subject: Avoid calling git outside of repository
 Origin: https://github.com/systemed/tilemaker/pull/298/commits/40e76bf286d3638ddf4a1d2c4134480e79b6c5f1
 Bug: https://github.com/systemed/tilemaker/pull/298
+
 ---
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 7316325..e35dcf6 100644
+index 7316325..32e4c1b 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -63,7 +63,7 @@ endif
+@@ -63,7 +63,9 @@ endif
  
  prefix = /usr/local
  
 -TM_VERSION := $(shell git describe --tags --abbrev=0)
-+TM_VERSION := v2.0.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/-[^-]*$$//')
  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
=====================================
@@ -5,24 +5,25 @@ Origin: https://github.com/systemed/tilemaker/pull/299/commits/9747e58170cbf82af
 Bug: https://github.com/systemed/tilemaker/pull/299
 
 ---
- Makefile             |  3 +++
+ Makefile             |  4 +++-
  docs/man/tilemaker.1 | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 54 insertions(+)
+ 2 files changed, 54 insertions(+), 1 deletion(-)
  create mode 100644 docs/man/tilemaker.1
 
 diff --git a/Makefile b/Makefile
-index b672922..a9a83eb 100644
+index 32e4c1b..5b6aa70 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -63,6 +63,7 @@ endif
-
+@@ -62,7 +62,7 @@ endif
+ # Main includes
+ 
  prefix = /usr/local
-
+-
 +MANPREFIX := /usr/share/man
- TM_VERSION := ${DEB_VERSION_UPSTREAM}
- 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
-@@ -88,6 +89,8 @@ tilemaker: include/osmformat.pb.o include/vector_tile.pb.o src/mbtiles.o src/pbf
+ 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/-[^-]*$$//')
+@@ -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/
  	install -m 0755 tilemaker $(DESTDIR)$(prefix)/bin/
@@ -33,12 +34,12 @@ index b672922..a9a83eb 100644
  	rm -f tilemaker src/*.o include/*.o
 diff --git a/docs/man/tilemaker.1 b/docs/man/tilemaker.1
 new file mode 100644
-index 0000000..5b1d459
+index 0000000..9e22552
 --- /dev/null
 +++ b/docs/man/tilemaker.1
 @@ -0,0 +1,51 @@
 +.\" Manpage for tilemaker.
-+.TH man 8 "27 Aug 2021" "1.0" "tilemaker man page"
++.TH man 1 "27 Aug 2021" "1.0" "tilemaker man page"
 +.SH NAME
 +tilemaker \- Generates vector tiles from OpenStreetMap data
 +.SH SYNOPSIS


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,3 @@
 0001-Add-DESTDIR-to-makefile.patch
-0002-Avoid-using-git-with-release.patch
+0002-Avoid-calling-git-outside-of-repository.patch
 0003-Add-man-page-for-tilemaker.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/tilemaker/-/commit/e88599415bd4428a941b9bd8917d1be3f21bd09d

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/tilemaker/-/commit/e88599415bd4428a941b9bd8917d1be3f21bd09d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210827/9f33e03b/attachment-0001.htm>