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

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

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


Commits:
ab0c567b by Felix Delattre at 2021-08-27T15:31:07+00:00
Add patch to handle DESTDIR.

- - - - -
8ef2f04b by Felix Delattre at 2021-08-27T15:34:36+00:00
Add patch to avoid calling git outside of repository.

- - - - -


6 changed files:

- debian/changelog
- + debian/patches/0001-Add-DESTDIR-to-makefile.patch
- + debian/patches/0002-Avoid-using-git-with-release.patch
- + debian/patches/series
- debian/rules
- − debian/tilemaker.install


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,8 @@
 tilemaker (2.0.0-1~exp1) UNRELEASED; urgency=medium
 
   * Imported version 2.0.0
+  * Add patch to handle DESTDIR.
+  * Add patch to avoid calling git outside of repository.
   * Initial package (Closes: #993076)
 
- -- Felix Delattre <debian at xama.nu>  Tue, 27 Aug 2021 11:13:23 +0000
+ -- Felix Delattre <debian at xama.nu>  Fri, 27 Aug 2021 15:34:03 +0000


=====================================
debian/patches/0001-Add-DESTDIR-to-makefile.patch
=====================================
@@ -0,0 +1,39 @@
+From: Felix Delattre <felix at delattre.de>
+Date: Fri, 27 Aug 2021 12:08:04 +0000
+Subject: Add DESTDIR to makefile
+Origin: https://github.com/systemed/tilemaker/pull/297/commits/90abe03ca8e9d8629b4fbb2a7753d17e067e8987
+Bug: https://github.com/systemed/tilemaker/pull/297
+
+---
+ Makefile | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 232912a..7316325 100644
+--- a/Makefile
++++ b/Makefile
+@@ -61,11 +61,14 @@ endif
+ 
+ # Main includes
+ 
++prefix = /usr/local
++
+ TM_VERSION := $(shell git describe --tags --abbrev=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)
+ 
++
+ # Targets
+ 
+ all: tilemaker
+@@ -83,7 +86,8 @@ tilemaker: include/osmformat.pb.o include/vector_tile.pb.o src/mbtiles.o src/pbf
+ 	protoc --proto_path=include --cpp_out=include $<
+ 
+ install:
+-	install -m 0755 tilemaker /usr/local/bin
++	install -m 0755 -d $(DESTDIR)$(prefix)/bin/
++	install -m 0755 tilemaker $(DESTDIR)$(prefix)/bin/
+ 
+ clean:
+ 	rm -f tilemaker src/*.o include/*.o


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


=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+0001-Add-DESTDIR-to-makefile.patch
+0002-Avoid-using-git-with-release.patch


=====================================
debian/rules
=====================================
@@ -1,9 +1,12 @@
 #!/usr/bin/make -f
 
-# DH_VERBOSE := 1
+DH_VERBOSE := 1
 
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@
+
+override_dh_auto_install:
+	dh_auto_install -- prefix=/usr


=====================================
debian/tilemaker.install deleted
=====================================
@@ -1 +0,0 @@
-usr/local/bin/tilemaker usr/bin



View it on GitLab: https://salsa.debian.org/debian-gis-team/tilemaker/-/compare/ee76d1cf08d845cab0b7e4e18e94bccb6f8cdbed...8ef2f04b415c1fddecf39132429b1b11829ada3d

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/tilemaker/-/compare/ee76d1cf08d845cab0b7e4e18e94bccb6f8cdbed...8ef2f04b415c1fddecf39132429b1b11829ada3d
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/19ae5fa2/attachment-0001.htm>