Bas Couwenberg pushed to branch master at Debian GIS Project / openlayers
Commits: 002d3a72 by Bas Couwenberg at 2023-02-20T14:15:44+01:00 Use packaging.version instead of distutils.version. - - - - - 3 changed files: - debian/changelog - debian/control - debian/patches/python3.patch Changes: ===================================== debian/changelog ===================================== @@ -2,6 +2,7 @@ openlayers (2.13.1+ds2-11) UNRELEASED; urgency=medium * Team upload. * Bump Standards-Version to 4.6.2, no changes. + * Use packaging.version instead of distutils.version. -- Bas Couwenberg <[email protected]> Wed, 18 Jan 2023 17:03:49 +0100 ===================================== debian/control ===================================== @@ -4,7 +4,8 @@ Uploaders: David Paleino <[email protected]> Section: javascript Priority: optional Build-Depends: debhelper-compat (= 12), - python3 + python3, + python3-packaging Build-Depends-Indep: uglifyjs Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/debian-gis-team/openlayers ===================================== debian/patches/python3.patch ===================================== @@ -512,3 +512,30 @@ Forwarded: not-needed raise MissingDependency(key) for depends in self.dependencies[key]: self._visit(depends) +--- a/tools/closure_library_jscompiler.py ++++ b/tools/closure_library_jscompiler.py +@@ -14,11 +14,12 @@ + + """Utility to use the Closure Compiler CLI from Python.""" + +-import distutils.version + import logging + import re + import subprocess + ++import packaging.version ++ + + # Pulls a version number from the first line of 'java -version' + # See http://java.sun.com/j2se/versioning_naming.html to learn more about the +@@ -47,8 +48,8 @@ def Compile(compiler_jar_path, source_pa + """ + + # User friendly version check. +- if not (distutils.version.LooseVersion(_GetJavaVersion()) >= +- distutils.version.LooseVersion('1.6')): ++ if not (packaging.version.Version(_GetJavaVersion()) >= ++ packaging.version.Version('1.6')): + logging.error('Closure Compiler requires Java 1.6 or higher. ' + 'Please visit http://www.java.com/getjava') + return View it on GitLab: https://salsa.debian.org/debian-gis-team/openlayers/-/commit/002d3a72820ebbb05cdf9ee2c2cf49c9de280d99 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/openlayers/-/commit/002d3a72820ebbb05cdf9ee2c2cf49c9de280d99 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
