Control: tags 1007912 + patch Dear maintainer,
I've prepared an NMU for automake-1.16 (versioned as 1:1.16.5-1.3). The diff is attached to this message. 0-day NMUing it, as it's my mistake I'm correcting. Regards. SR
diff -Nru automake-1.16-1.16.5/debian/changelog automake-1.16-1.16.5/debian/changelog --- automake-1.16-1.16.5/debian/changelog 2022-03-15 20:13:57.000000000 -0400 +++ automake-1.16-1.16.5/debian/changelog 2022-03-18 09:09:08.000000000 -0400 @@ -1,3 +1,11 @@ +automake-1.16 (1:1.16.5-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix a regression in the patch in 1:1.16.5-1.2, support older Python + versions. (Closes: #1007912) + + -- Stefano Rivera <stefa...@debian.org> Fri, 18 Mar 2022 09:09:08 -0400 + automake-1.16 (1:1.16.5-1.2) unstable; urgency=medium * Non maintainer upload diff -Nru automake-1.16-1.16.5/debian/patches/python3.10-sysconfig.patch automake-1.16-1.16.5/debian/patches/python3.10-sysconfig.patch --- automake-1.16-1.16.5/debian/patches/python3.10-sysconfig.patch 2022-03-15 20:13:43.000000000 -0400 +++ automake-1.16-1.16.5/debian/patches/python3.10-sysconfig.patch 2022-03-18 09:09:08.000000000 -0400 @@ -22,14 +22,19 @@ Forwarded: http://debbugs.gnu.org/54412 Last-Update: 2022-03-15 ---- automake-1.16-1.16.5.orig/m4/python.m4 -+++ automake-1.16-1.16.5/m4/python.m4 -@@ -255,7 +255,11 @@ except ImportError: +diff --git a/m4/python.m4 b/m4/python.m4 +index 6653e4d89..c7db51814 100644 +--- a/m4/python.m4 ++++ b/m4/python.m4 +@@ -255,7 +255,14 @@ except ImportError: am_cv_python_pythondir=`$PYTHON -c " $am_python_setup_sysconfig if can_use_sysconfig: - sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) -+ scheme = sysconfig.get_default_scheme() ++ if hasattr(sysconfig, 'get_default_scheme'): ++ scheme = sysconfig.get_default_scheme() ++ else: ++ scheme = sysconfig._get_default_scheme() + if scheme == 'posix_local': + # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ + scheme = 'posix_prefix' @@ -37,12 +42,15 @@ else: from distutils import sysconfig sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') -@@ -297,7 +301,11 @@ sys.stdout.write(sitedir)"` +@@ -297,7 +304,14 @@ sys.stdout.write(sitedir)"` am_cv_python_pyexecdir=`$PYTHON -c " $am_python_setup_sysconfig if can_use_sysconfig: - sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'}) -+ scheme = sysconfig.get_default_scheme() ++ if hasattr(sysconfig, 'get_default_scheme'): ++ scheme = sysconfig.get_default_scheme() ++ else: ++ scheme = sysconfig._get_default_scheme() + if scheme == 'posix_local': + # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ + scheme = 'posix_prefix'
