[Git][debian-gis-team/tilemaker][master] 2 commits: Add patch to handle DESTDIR.

[Sebastiaan Couwenberg]

On 8/27/21 5:38 PM, ǝɹʇʇɐʃǝ◖ xıʃǝɟ (@xamanu) wrote:
> =====================================
> debian/patches/0002-Avoid-using-git-with-release.patch
> =====================================
> @@ -0,0 +1,22 @@
> +From: Felix Delattre <felix at delattre.de>
> +Date: Fri, 27 Aug 2021 14:55:35 +0000
> +Subject: Avoid using git with release
> +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(-)
> +
> +diff --git a/Makefile b/Makefile
> +index 7316325..e35dcf6 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -63,7 +63,7 @@ endif
> + 
> + prefix = /usr/local
> + 
> +-TM_VERSION := $(shell git describe --tags --abbrev=0)
> ++TM_VERSION := v2.0.0
> + 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)

Don't hardcode the version, use dpkg-parsechangelog to get it from
debian/changelog when DEB_VERSION_UPSTREAM is not set in the environment
via /usr/share/dpkg/pkg-info.mk. See python-cartopy for example:

 https://salsa.debian.org/debian-gis-team/python-cartopy/-/blob/master/debian/version.py

Kind Regards,

Bas

-- 
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1