[Git][debian-gis-team/tilemaker][master] 4 commits: Added example configuration files and process scripts.

ǝɹʇʇɐʃǝ◖ xıʃǝɟ (@xamanu) gitlab at salsa.debian.org
Tue Aug 31 11:31:34 BST 2021



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


Commits:
f63b18e7 by Felix Delattre at 2021-08-31T09:38:20+00:00
Added example configuration files and process scripts.

- - - - -
938c4acb by Felix Delattre at 2021-08-31T10:09:04+00:00
Reformat patch to rely on packaged rapidjson.

- - - - -
d096a14d by Felix Delattre at 2021-08-31T10:21:32+00:00
Fix typo in copyright file.

- - - - -
0763bd99 by Felix Delattre at 2021-08-31T10:28:31+00:00
Clarify configuration handling in man file.

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/patches/0003-Add-man-page-for-tilemaker.patch
- debian/patches/0004-Rely-on-packaged-rapidjson-dependency.patch
- debian/rules
- + debian/tilemaker.examples


Changes:

=====================================
debian/changelog
=====================================
@@ -5,6 +5,7 @@ tilemaker (2.0.0-1~exp1) experimental; urgency=medium
   * Add patch to avoid calling git outside of repository.
   * Add patch to add man page for tilemaker.
   * Add patch to rely on packaged rapidjson dependency.
+  * Add example configuration and processing files.
   * Initial package (Closes: #993076)
 
- -- Felix Delattre <debian at xama.nu>  Sat, 28 Aug 2021 10:30:31 +0000
+ -- Felix Delattre <debian at xama.nu>  Tue, 31 Aug 2021 09:29:12 +0000


=====================================
debian/control
=====================================
@@ -28,5 +28,4 @@ Depends: shapelib,
          ${shlibs:Depends},
 Description: Generates vector tiles from OpenStreetMap data
  tilemaker generates vector tiles without from OpenStreetMap planet and diff
- files without any complex stack or need for database. It uses the schema of
- OpenMapTiles by default, but other configuration can be provided.
+ files without any complex stack or need for database.


=====================================
debian/copyright
=====================================
@@ -19,7 +19,7 @@ Files: include/kaguya.hpp
 Copyright: 2016-2017, satoren
 License: BSL-1.0
 
-Files: server/static/fronts/*
+Files: server/static/fonts/*
 Copyright: 2010-2016, Google Inc.
            2016, Klokan Technologies GmbH
 License: OFL-1.1


=====================================
debian/patches/0003-Add-man-page-for-tilemaker.patch
=====================================
@@ -6,8 +6,8 @@ Bug: https://github.com/systemed/tilemaker/pull/299
 
 ---
  Makefile             |  4 +++-
- docs/man/tilemaker.1 | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 56 insertions(+), 1 deletion(-)
+ docs/man/tilemaker.1 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 57 insertions(+), 1 deletion(-)
  create mode 100644 docs/man/tilemaker.1
 
 diff --git a/Makefile b/Makefile
@@ -34,10 +34,10 @@ index 32e4c1b..5b6aa70 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..2d15422
+index 0000000..6231685
 --- /dev/null
 +++ b/docs/man/tilemaker.1
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,54 @@
 +.\" Manpage for tilemaker.
 +.TH man 1 "27 Aug 2021" "1.0" "tilemaker man page"
 +.SH NAME
@@ -51,8 +51,7 @@ index 0000000..2d15422
 +.PP
 +.B tilemaker
 +generates vector tiles without from OpenStreetMap planet and diff
-+files without any complex stack or need for database. It uses the schema of
-+OpenMapTiles by default, but other configuration can be provided.
++files without any complex stack or need for database.
 +.PP
 +This program follows the usual GNU command line syntax, with long
 +options starting with two dashes (`-').
@@ -65,10 +64,12 @@ index 0000000..2d15422
 +Target path and file for vector tiles (.mbtiles/.sqlite).
 +.TP
 +\fB\-\-config
-+Specific config file (.json).
++Specific config file (.json). If is nothing provided, tilemaker expects a
++`config.json` file in the current directory.
 +.TP
 +\fB\-\-process
-+Lua processing script for processing tags.
++Lua processing script for processing tags (.lua). If is nothing provided,
++tilemaker expects a `process.lua` file in the current directory.
 +.TP
 +\fB\-\-store
 +Path to the directory as a temporary store during processing.


=====================================
debian/patches/0004-Rely-on-packaged-rapidjson-dependency.patch
=====================================
The diff for this file was not included because it is too large.

=====================================
debian/rules
=====================================
@@ -11,3 +11,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 override_dh_auto_install:
 	dh_auto_install -- prefix=/usr
+
+override_dh_compress:
+	dh_compress -X.lua -X.json


=====================================
debian/tilemaker.examples
=====================================
@@ -0,0 +1 @@
+resources/*



View it on GitLab: https://salsa.debian.org/debian-gis-team/tilemaker/-/compare/854b41396af6835c5e02e74e6cb0aa05ba454382...0763bd994303823ad446f8190a8f4cebb012a4b5

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/tilemaker/-/compare/854b41396af6835c5e02e74e6cb0aa05ba454382...0763bd994303823ad446f8190a8f4cebb012a4b5
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/20210831/ef90578b/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list