[Git][debian-gis-team/nik4][master] 5 commits: New upstream version 1.8

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Tue Dec 3 05:39:11 GMT 2024



Bas Couwenberg pushed to branch master at Debian GIS Project / nik4


Commits:
5c155188 by Bas Couwenberg at 2024-12-03T06:30:51+01:00
New upstream version 1.8
- - - - -
16cb0073 by Bas Couwenberg at 2024-12-03T06:30:52+01:00
Update upstream source from tag 'upstream/1.8'

Update to upstream version '1.8'
with Debian dir 5d02a617c96d3d16cffd2bb763b9808f3f463081
- - - - -
a94800b0 by Bas Couwenberg at 2024-12-03T06:31:36+01:00
New upstream release.

- - - - -
8e9e97f2 by Bas Couwenberg at 2024-12-03T06:34:15+01:00
Drop no-distutils.patch, applied upstream.

- - - - -
70137599 by Bas Couwenberg at 2024-12-03T06:34:52+01:00
Set distribution to unstable.

- - - - -


9 changed files:

- .gitignore
- CHANGELOG.md
- debian/changelog
- − debian/patches/no-distutils.patch
- debian/patches/proj.patch
- debian/patches/series
- nik4.py
- + pyproject.toml
- setup.py


Changes:

=====================================
.gitignore
=====================================
@@ -1,3 +1,5 @@
+.venv/
+Nik4.egg-info/
 dist/
 build/
 README.txt


=====================================
CHANGELOG.md
=====================================
@@ -1,5 +1,9 @@
 # Nik4 Change History
 
+## 1.8, 1.12.2024
+
+* Fixed font loading. [#46](https://github.com/Zverik/Nik4/pull/46) — thanks @Luflosi.
+
 ## 1.7, 27.03.2021
 
 * Choose any projection with `--projection`. [#29](https://github.com/Zverik/Nik4/pull/29) - thanks @Nakaner.


=====================================
debian/changelog
=====================================
@@ -1,15 +1,15 @@
-nik4 (1.7-3) UNRELEASED; urgency=medium
+nik4 (1.8-1) unstable; urgency=medium
 
-  * Bump Standards-Version to 4.7.0, no changes.
-  * Add patch to not use deprecated distutils module.
+  * New upstream release.
     (closes: #1080679)
+  * Bump Standards-Version to 4.7.0, no changes.
   * Add pybuild-plugin-pyproject to build dependencies.
   * Bump debhelper compat to 13.
   * Use execute_{before,after} instead of override in rules file.
   * Enable Salsa CI.
   * Switch to dh-sequence-*.
 
- -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 Jan 2023 17:03:36 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 03 Dec 2024 06:34:37 +0100
 
 nik4 (1.7-2) unstable; urgency=medium
 


=====================================
debian/patches/no-distutils.patch deleted
=====================================
@@ -1,27 +0,0 @@
-Description: Don't use deprecated distutils module.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/Zverik/Nik4/pull/45
-Applied-Upstream: https://github.com/Zverik/Nik4/commit/6e3605cea1762e37cc2476ca157ce0045b9d817f
-
---- a/setup.py
-+++ b/setup.py
-@@ -1,4 +1,4 @@
--from distutils.core import setup
-+from setuptools import setup
- 
- setup(
-         name='Nik4',
-@@ -22,6 +22,7 @@ to see available options and their descr
-         requires=['Mapnik'],
-         keywords='Mapnik,GIS,OpenStreetMap,mapping,export',
-         scripts=['nik4.py'],
-+        packages=[],
-         classifiers=[
-             'Development Status :: 5 - Production/Stable',
-             'Environment :: Console',
---- /dev/null
-+++ b/pyproject.toml
-@@ -0,0 +1,3 @@
-+[build-system]
-+requires = ["setuptools"]
-+build-backend = "setuptools.build_meta"


=====================================
debian/patches/proj.patch
=====================================
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/nik4.py
 +++ b/nik4.py
-@@ -306,7 +306,7 @@ def run(options):
+@@ -311,7 +311,7 @@ def run(options):
  
      # output projection
      if options.projection.isdigit():


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
 nik4.patch
 proj.patch
-no-distutils.patch


=====================================
nik4.py
=====================================
@@ -21,7 +21,7 @@ try:
 except ImportError:
     HAS_CAIRO = False
 
-VERSION = '1.7'
+VERSION = '1.8'
 TILE_BUFFER = 128
 IM_MONTAGE = 'montage'
 EPSG_4326 = '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
@@ -286,6 +286,11 @@ def run(options):
     bbox = None
     rotate = not options.norotate
 
+    # register non-standard fonts
+    if options.fonts:
+        for f in options.fonts:
+            add_fonts(f)
+
     if (options.ozi and options.projection.lower() != 'epsg:3857'
             and options.projection != EPSG_3857):
         raise Exception('Ozi map file output is only supported for Web Mercator (EPSG:3857). ' +
@@ -421,11 +426,6 @@ def run(options):
     mapnik.load_map_from_string(m, style_xml.encode("utf-8"), False, style_path)
     m.srs = proj_target.params()
 
-    # register non-standard fonts
-    if options.fonts:
-        for f in options.fonts:
-            add_fonts(f)
-
     # get bbox from layer extents
     if options.fit:
         bbox = layer_bbox(m, options.fit.split(','), proj_target, bbox)


=====================================
pyproject.toml
=====================================
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"


=====================================
setup.py
=====================================
@@ -1,8 +1,8 @@
-from distutils.core import setup
+from setuptools import setup
 
 setup(
         name='Nik4',
-        version='1.7.0',
+        version='1.8.0',
         license='WTFPL',
         description='Command-line interface to a Mapnik rendering toolkit',
         long_description="""
@@ -22,6 +22,7 @@ to see available options and their descriptions.
         requires=['Mapnik'],
         keywords='Mapnik,GIS,OpenStreetMap,mapping,export',
         scripts=['nik4.py'],
+        packages=[],
         classifiers=[
             'Development Status :: 5 - Production/Stable',
             'Environment :: Console',



View it on GitLab: https://salsa.debian.org/debian-gis-team/nik4/-/compare/acc30c68ac50c7075b4853c3f8c7a949ac2157e9...70137599f551552eb127f69ff6386bb12ebbe9c5

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/nik4/-/compare/acc30c68ac50c7075b4853c3f8c7a949ac2157e9...70137599f551552eb127f69ff6386bb12ebbe9c5
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/20241203/24701ec7/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list