Bas Couwenberg pushed to branch master at Debian GIS Project / mapserver
Commits: f5ecceaf by Bas Couwenberg at 2023-02-19T14:00:12+01:00 Use dh_python3 to fix shebang instead of a patch. - - - - - 863c37fc by Bas Couwenberg at 2023-02-19T14:13:45+01:00 Update obsolete freetype build dependency. - - - - - 9272b980 by Bas Couwenberg at 2023-02-19T14:14:09+01:00 Update lintian overrides. - - - - - 50db88ce by Bas Couwenberg at 2023-02-19T14:27:52+01:00 Add patch to not use deprecated distutils module. - - - - - 7 changed files: - debian/changelog - debian/control - − debian/libmapserver2.lintian-overrides - − debian/patches/interpreter-path.path - + debian/patches/no-distutils.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -2,6 +2,10 @@ mapserver (8.0.0-4) UNRELEASED; urgency=medium * Add Rules-Requires-Root to control file. * Bump Standards-Version to 4.6.2, no changes. + * Use dh_python3 to fix shebang instead of a patch. + * Update obsolete freetype build dependency. + * Update lintian overrides. + * Add patch to not use deprecated distutils module. -- Bas Couwenberg <[email protected]> Mon, 28 Nov 2022 13:24:21 +0100 ===================================== debian/control ===================================== @@ -16,7 +16,7 @@ Build-Depends: debhelper-compat (= 12), libcairo2-dev, libcurl4-gnutls-dev | libcurl-ssl-dev, libfcgi-dev, - libfreetype6-dev (>= 2.0.9), + libfreetype-dev, libfribidi-dev, libgdal-dev (>= 1.10.1-0~), libgeos-dev (>= 3.3.1-1~), ===================================== debian/libmapserver2.lintian-overrides deleted ===================================== @@ -1,3 +0,0 @@ -# False positive, entity "¤" -- currency sign, U+00A4 ISOnum -spelling-error-in-binary curren current * - ===================================== debian/patches/interpreter-path.path deleted ===================================== @@ -1,36 +0,0 @@ -Description: Fix example-unusual-interpreter lintian issue. -Author: Bas Couwenberg <[email protected]> -Forwarded: not-needed - ---- a/mapscript/python/examples/project_csv.py -+++ b/mapscript/python/examples/project_csv.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - """ - Simple example to read a csv file and reproject point x/y data ---- a/mapscript/python/examples/shpdump.py -+++ b/mapscript/python/examples/shpdump.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - """ - Dump the contents of the passed in Shapefile ---- a/mapscript/python/examples/shpinfo.py -+++ b/mapscript/python/examples/shpinfo.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - """ - Extracts basic descriptive information from a Shapefile ---- a/mapscript/python/examples/wxs.py -+++ b/mapscript/python/examples/wxs.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - """ - Output WMS GetCapabilities response for a Mapfile ===================================== debian/patches/no-distutils.patch ===================================== @@ -0,0 +1,24 @@ +Description: Don't use deprecated distutils module. +Author: Bas Couwenberg <[email protected]> +Forwarded: https://github.com/MapServer/MapServer/pull/6839 + +--- a/mapscript/python/tests/timing/testing.py ++++ b/mapscript/python/tests/timing/testing.py +@@ -39,7 +39,7 @@ + + import os + import sys +-import distutils.util ++import sysconfig + import unittest + + # define the path to mapserver test data +@@ -50,7 +50,7 @@ XMARKS_IMAGE = os.path.join(TESTS_PATH, + TEST_IMAGE = os.path.join(TESTS_PATH, 'test.png') + + # Put local build directory on head of python path +-platformdir = '-'.join((distutils.util.get_platform(), ++platformdir = '-'.join((sysconfig.get_platform(), + '.'.join(map(str, sys.version_info[0:2])))) + sys.path.insert(0, os.path.join('build', 'lib.' + platformdir)) + ===================================== debian/patches/series ===================================== @@ -1,4 +1,4 @@ perl-mapscript-install.patch java-hardening.patch -interpreter-path.path setuptools.patch +no-distutils.patch ===================================== debian/rules ===================================== @@ -114,7 +114,8 @@ override_dh_makeshlibs: dh_makeshlibs -- -c0 -v$(MS_VERSION) override_dh_python3: - dh_python3 -ppython3-mapscript + dh_python3 -ppython3-mapscript --shebang=/usr/bin/python3 + dh_python3 -ppython3-mapscript --shebang=/usr/bin/python3 /usr/share/doc/python3-mapscript/examples override_dh_perl: dh_perl -plibmapscript-perl View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/23d2c308b4d73d4da422b4bf492572f9c33ac63e...50db88cedbe30b59c35329c44e9a87e3e425754e -- View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/23d2c308b4d73d4da422b4bf492572f9c33ac63e...50db88cedbe30b59c35329c44e9a87e3e425754e You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
