Control: tags 1022491 + patch Control: tags 1022491 + pending Dear maintainer,
I've prepared an NMU for deluge (versioned as 2.0.3-3.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. SR
diff -Nru deluge-2.0.3/debian/changelog deluge-2.0.3/debian/changelog --- deluge-2.0.3/debian/changelog 2021-07-15 13:57:18.000000000 +0200 +++ deluge-2.0.3/debian/changelog 2022-11-12 22:37:10.000000000 +0200 @@ -1,3 +1,10 @@ +deluge (2.0.3-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * Patch: Support setuptools >= 60. (Closes: #1022491) + + -- Stefano Rivera <stefa...@debian.org> Sat, 12 Nov 2022 22:37:10 +0200 + deluge (2.0.3-3.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru deluge-2.0.3/debian/patches/series deluge-2.0.3/debian/patches/series --- deluge-2.0.3/debian/patches/series 2021-07-15 13:45:42.000000000 +0200 +++ deluge-2.0.3/debian/patches/series 2022-11-12 22:37:10.000000000 +0200 @@ -1,2 +1,3 @@ new_release_check.patch 0001-Fix-warning-related-to-gettext.patch +setuptools-60.patch diff -Nru deluge-2.0.3/debian/patches/setuptools-60.patch deluge-2.0.3/debian/patches/setuptools-60.patch --- deluge-2.0.3/debian/patches/setuptools-60.patch 1970-01-01 02:00:00.000000000 +0200 +++ deluge-2.0.3/debian/patches/setuptools-60.patch 2022-11-12 22:37:10.000000000 +0200 @@ -0,0 +1,43 @@ +From: Stefano Rivera <stefa...@debian.org> +Date: Sat, 12 Nov 2022 22:34:04 +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/1022491 +Forwarded: https://github.com/deluge-torrent/deluge/pull/400 +--- + setup.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/setup.py b/setup.py +index 5cae466..fb49f10 100755 +--- a/setup.py ++++ b/setup.py +@@ -15,15 +15,16 @@ import glob + import os + import platform + import sys ++from shutil import rmtree ++ ++from setuptools import find_packages, setup ++from setuptools.command.test import test as _test ++ + from distutils import cmd + from distutils.command.build import build as _build + from distutils.command.clean import clean as _clean + from distutils.command.install_data import install_data as _install_data + from distutils.spawn import find_executable +-from shutil import rmtree +- +-from setuptools import find_packages, setup +-from setuptools.command.test import test as _test + + import msgfmt + from version import get_version
