Control: tags 1022437 + patch Control: tags 1022437 + pending Dear maintainer,
I've prepared an NMU for rapid-photo-downloader (versioned as 0.9.33-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. SR
diff -Nru rapid-photo-downloader-0.9.33/debian/changelog rapid-photo-downloader-0.9.33/debian/changelog --- rapid-photo-downloader-0.9.33/debian/changelog 2022-05-17 22:36:26.000000000 +0200 +++ rapid-photo-downloader-0.9.33/debian/changelog 2022-11-09 15:48:06.000000000 +0200 @@ -1,3 +1,10 @@ +rapid-photo-downloader (0.9.33-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Patch: Support setuptools 60. (Closes: #1022437) + + -- Stefano Rivera <stefa...@debian.org> Wed, 09 Nov 2022 15:48:06 +0200 + rapid-photo-downloader (0.9.33-1) unstable; urgency=medium [ Tino Mettler ] diff -Nru rapid-photo-downloader-0.9.33/debian/patches/0001-Disable-version-checks-on-startup.patch rapid-photo-downloader-0.9.33/debian/patches/0001-Disable-version-checks-on-startup.patch --- rapid-photo-downloader-0.9.33/debian/patches/0001-Disable-version-checks-on-startup.patch 2022-05-17 22:36:26.000000000 +0200 +++ rapid-photo-downloader-0.9.33/debian/patches/0001-Disable-version-checks-on-startup.patch 2022-11-09 15:48:06.000000000 +0200 @@ -17,10 +17,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/raphodo/constants.py b/raphodo/constants.py -index 8361d55..59e4c79 100644 +index b6200f8..00fb4e6 100644 --- a/raphodo/constants.py +++ b/raphodo/constants.py -@@ -31,7 +31,7 @@ remote_versions_file = 'https://www.damonlynch.net/rapid/version.json' +@@ -31,7 +31,7 @@ remote_versions_file = "https://damonlynch.net/rapid/version.json"; # If set to True, the ability to check for a new version will be removed # from the user interface and disabled in program logic. diff -Nru rapid-photo-downloader-0.9.33/debian/patches/0002-Import-setuptools-before-distutils.patch rapid-photo-downloader-0.9.33/debian/patches/0002-Import-setuptools-before-distutils.patch --- rapid-photo-downloader-0.9.33/debian/patches/0002-Import-setuptools-before-distutils.patch 1970-01-01 02:00:00.000000000 +0200 +++ rapid-photo-downloader-0.9.33/debian/patches/0002-Import-setuptools-before-distutils.patch 2022-11-09 15:48:06.000000000 +0200 @@ -0,0 +1,32 @@ +From: Stefano Rivera <stefa...@debian.org> +Date: Wed, 9 Nov 2022 15:22:13 +0200 +Subject: Import setuptools before distutils + +setuptools 60 uses its own bunlded 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 is to prepare for Python 3.12, which will drop distutils. + +Forwarded: https://code.launchpad.net/~stefanor/rapid/setuptools-60/+merge/432746 +Bug-Debian: https://bugs.debian.org/1022437 +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 34ca2fc..0de1056 100644 +--- a/setup.py ++++ b/setup.py +@@ -30,9 +30,9 @@ __copyright__ = ( + + import os + from glob import glob +-from distutils.command.build import build + from setuptools import setup, Command + from setuptools.command.sdist import sdist ++from distutils.command.build import build + + + here = os.path.abspath(os.path.dirname(__file__)) diff -Nru rapid-photo-downloader-0.9.33/debian/patches/series rapid-photo-downloader-0.9.33/debian/patches/series --- rapid-photo-downloader-0.9.33/debian/patches/series 2022-05-17 22:36:26.000000000 +0200 +++ rapid-photo-downloader-0.9.33/debian/patches/series 2022-11-09 15:48:06.000000000 +0200 @@ -1 +1,2 @@ 0001-Disable-version-checks-on-startup.patch +0002-Import-setuptools-before-distutils.patch
