[Git][debian-gis-team/tirex][master] 3 commits: Add patch to avoid simple building error.

ǝɹʇʇɐʃǝ◖ xıʃǝɟ (@xamanu) gitlab at salsa.debian.org
Sun Aug 29 14:53:46 BST 2021



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


Commits:
df7a04cd by Felix Delattre at 2021-08-29T13:30:43+00:00
Add patch to avoid simple building error.

- - - - -
6827031e by Felix Delattre at 2021-08-29T13:51:56+00:00
Disconnect logrotate configuration overlap.

- - - - -
dc998d16 by Felix Delattre at 2021-08-29T13:52:30+00:00
Review Depends on tirex-syncd.

- - - - -


6 changed files:

- debian/control
- debian/logrotate.d-tirex-master → debian/etc/logrotate.d/tirex-master
- + debian/patches/0001-Fix-simple-pod-syntax-error-for-OpenSeaMap.patch
- + debian/patches/0002-Disconnect-configuration-overlap-between-build-and-d.patch
- + debian/patches/series
- debian/tirex.install


Changes:

=====================================
debian/control
=====================================
@@ -33,7 +33,7 @@ Package: tirex-syncd
 Section: utils
 Architecture: any
 Depends: tirex,
-         ${shlibs:Depends},
+         ${perl:Depends},
          ${misc:Depends},
 Description: Tirex sync daemon
  The Tirex suite of programs manages map tile rendering and caching.


=====================================
debian/logrotate.d-tirex-master → debian/etc/logrotate.d/tirex-master
=====================================


=====================================
debian/patches/0001-Fix-simple-pod-syntax-error-for-OpenSeaMap.patch
=====================================
@@ -0,0 +1,23 @@
+From: Felix Delattre <felix at delattre.de>
+Date: Sun, 29 Aug 2021 13:24:51 +0000
+Subject: Fix simple pod syntax error for OpenSeaMap
+Origin: https://github.com/openstreetmap/tirex/pull/37/commits/9004168e424b22ec4b27fb731489971a771af65c
+Bug: https://github.com/openstreetmap/tirex/pull/37
+
+---
+ lib/Tirex/Backend/OpenSeaMap.pm | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/Tirex/Backend/OpenSeaMap.pm b/lib/Tirex/Backend/OpenSeaMap.pm
+index 277b0cc..b41450a 100644
+--- a/lib/Tirex/Backend/OpenSeaMap.pm
++++ b/lib/Tirex/Backend/OpenSeaMap.pm
+@@ -38,6 +38,8 @@ Config parameters for the map file:
+ 
+ =item tilesize the tile size (should be 256 * scalefactor to avoid issues)
+ 
++=back
++
+ =head1 METHODS
+ 
+ =head2 $backend->init()


=====================================
debian/patches/0002-Disconnect-configuration-overlap-between-build-and-d.patch
=====================================
@@ -0,0 +1,23 @@
+From: Felix Delattre <felix at delattre.de>
+Date: Sun, 29 Aug 2021 13:26:33 +0000
+Subject: Disconnect configuration overlap between build and debian packaging
+Origin: https://github.com/openstreetmap/tirex/pull/34/commits/ae3b7495083a942b4196e435759054d77721164e
+Bug: https://github.com/openstreetmap/tirex/pull/34
+
+---
+ Makefile | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7d45111..92dce76 100644
+--- a/Makefile
++++ b/Makefile
+@@ -61,8 +61,6 @@ install: build
+ 	install -m 644 ${INSTALLOPTS} etc/renderer/mapserver/fonts.lst         $(DESTDIR)/etc/tirex/renderer/mapserver/fonts.lst
+ 	install -m 755 ${INSTALLOPTS} -d                                       $(DESTDIR)/etc/tirex/renderer/mapnik
+ 	install -m 644 ${INSTALLOPTS} etc/renderer/mapnik.conf.dist            $(DESTDIR)/etc/tirex/renderer/mapnik.conf
+-	install -m 755 ${INSTALLOPTS} -d                                       $(DESTDIR)/etc/logrotate.d
+-	install -m 644 ${INSTALLOPTS} debian/logrotate.d-tirex-master          $(DESTDIR)/etc/logrotate.d/tirex-master
+ 	install -m 755 ${INSTALLOPTS} -d                                       $(DESTDIR)/usr/share/man/man1/
+ 	for program in bin/*; do \
+         if grep -q "=head" $$program; then \


=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+0001-Fix-simple-pod-syntax-error-for-OpenSeaMap.patch
+0002-Disconnect-configuration-overlap-between-build-and-d.patch


=====================================
debian/tirex.install
=====================================
@@ -18,7 +18,7 @@ usr/share/man/man1/tirex-tiledir-check.1
 usr/share/man/man1/tirex-tiledir-stat.1
 usr/share/man/man3
 usr/share/perl5
-etc/logrotate.d/tirex-master
+debian/etc/logrotate.d/tirex-master              etc/logrotate.d/tirex-master
 debian/etc/tirex/renderer/test.conf              etc/tirex/renderer
 debian/etc/tirex/renderer/test/checkerboard.conf etc/tirex/renderer/test
 debian/etc/tirex/tirex.conf                      etc/tirex



View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/compare/a74b670a948db9c65b56bed07a173c44d4d5c83a...dc998d162a8614a3db52afbc29942f1d824b8210

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/compare/a74b670a948db9c65b56bed07a173c44d4d5c83a...dc998d162a8614a3db52afbc29942f1d824b8210
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/20210829/e0efad5d/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list