Control: tags 1022527 + patch Control: tags 1022527 + pending Dear maintainer,
I've prepared an NMU for ddupdate (versioned as 0.6.6-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. SR
diff -Nru ddupdate-0.6.6/debian/changelog ddupdate-0.6.6/debian/changelog --- ddupdate-0.6.6/debian/changelog 2022-10-15 11:03:45.000000000 +0200 +++ ddupdate-0.6.6/debian/changelog 2022-11-13 10:16:41.000000000 +0200 @@ -1,3 +1,10 @@ +ddupdate (0.6.6-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Add support for setuptools >= 60 (Closes: #1022527) + + -- Stefano Rivera <stefa...@debian.org> Sun, 13 Nov 2022 10:16:41 +0200 + ddupdate (0.6.6-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru ddupdate-0.6.6/debian/patches/series ddupdate-0.6.6/debian/patches/series --- ddupdate-0.6.6/debian/patches/series 2022-01-20 16:12:35.000000000 +0200 +++ ddupdate-0.6.6/debian/patches/series 2022-11-13 10:13:03.000000000 +0200 @@ -1 +1,2 @@ 0001-fix-systemd-service +setuptools-60 diff -Nru ddupdate-0.6.6/debian/patches/setuptools-60 ddupdate-0.6.6/debian/patches/setuptools-60 --- ddupdate-0.6.6/debian/patches/setuptools-60 1970-01-01 02:00:00.000000000 +0200 +++ ddupdate-0.6.6/debian/patches/setuptools-60 2022-11-13 10:14:07.000000000 +0200 @@ -0,0 +1,37 @@ +From b01dc01a3f4194043fae579416f5cab5ffffc0b0 Mon Sep 17 00:00:00 2001 +From: Stefano Rivera <stef...@rivera.za.net> +Date: Sun, 13 Nov 2022 10:07:43 +0200 +Subject: Import setuptools before distutils + +setuptools 60 uses its own bundled version of distutils, by default. It +injects this into sys.modules, at import time. So we need to make sure +that it is imported, before anything else imports distutils, to ensure +everything is using the same distutils version. + +This change in setuptools is to prepare for Python 3.12, which will drop +distutils. + +Bug-Debian: https://bugs.debian.org/1022527 +Forwarded: https://github.com/leamas/ddupdate/pull/76 +--- + setup.py | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/setup.py ++++ b/setup.py +@@ -3,13 +3,12 @@ + import shutil + import os + import subprocess ++from glob import glob + ++from setuptools import setup + from distutils.command.clean import clean + from distutils.command.install import install + +-from glob import glob +-from setuptools import setup +- + # pylint: disable=bad-continuation + ROOT = os.path.dirname(__file__) + ROOT = ROOT if ROOT else '.'
