Control: tags 1022525 + patch Control: tags 1022525 + pending Dear maintainer,
I've prepared an NMU for python-cbor (versioned as 1.0.0-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. SR
diff -Nru python-cbor-1.0.0/debian/changelog python-cbor-1.0.0/debian/changelog --- python-cbor-1.0.0/debian/changelog 2019-10-15 02:56:11.000000000 +0200 +++ python-cbor-1.0.0/debian/changelog 2022-11-13 10:04:41.000000000 +0200 @@ -1,3 +1,11 @@ +python-cbor (1.0.0-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Update homepage to point to the replacement GitHub repo. + * Patch: Support setuptools >= 60 (Closes: #1022525) + + -- Stefano Rivera <stefa...@debian.org> Sun, 13 Nov 2022 10:04:41 +0200 + python-cbor (1.0.0-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru python-cbor-1.0.0/debian/control python-cbor-1.0.0/debian/control --- python-cbor-1.0.0/debian/control 2019-10-15 02:56:01.000000000 +0200 +++ python-cbor-1.0.0/debian/control 2022-11-13 09:54:47.000000000 +0200 @@ -10,7 +10,7 @@ Standards-Version: 4.0.0 X-Python-Version: >= 2.7 X-Python3-Version: >= 3.3 -Homepage: https://bitbucket.org/bodhisnarkva/cbor +Homepage: https://github.com/brianolson/cbor_py Vcs-Git: https://anonscm.debian.org/git/collab-maint/python-cbor.git Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/python-cbor.git diff -Nru python-cbor-1.0.0/debian/copyright python-cbor-1.0.0/debian/copyright --- python-cbor-1.0.0/debian/copyright 2015-09-03 20:50:51.000000000 +0200 +++ python-cbor-1.0.0/debian/copyright 2022-11-13 09:55:13.000000000 +0200 @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: python-cbor -Upstream-Contact: https://bitbucket.org/bodhisnarkva/cbor -Source: https://bitbucket.org/bodhisnarkva/cbor +Upstream-Contact: https://github.com/brianolson/cbor_py +Source: https://github.com/brianolson/cbor_py Files: * Copyright: 2014-2015 Brian Olson diff -Nru python-cbor-1.0.0/debian/patches/series python-cbor-1.0.0/debian/patches/series --- python-cbor-1.0.0/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ python-cbor-1.0.0/debian/patches/series 2022-11-13 09:58:00.000000000 +0200 @@ -0,0 +1 @@ +setuptools-60 diff -Nru python-cbor-1.0.0/debian/patches/setuptools-60 python-cbor-1.0.0/debian/patches/setuptools-60 --- python-cbor-1.0.0/debian/patches/setuptools-60 1970-01-01 02:00:00.000000000 +0200 +++ python-cbor-1.0.0/debian/patches/setuptools-60 2022-11-13 09:58:27.000000000 +0200 @@ -0,0 +1,42 @@ +From 36507492af9e51a95fe2514e07d283b30b812dd6 Mon Sep 17 00:00:00 2001 +From: Stefano Rivera <stef...@rivera.za.net> +Date: Sun, 13 Nov 2022 09:56:25 +0200 +Subject: [PATCH] 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/1022525 +Forwarded: https://github.com/brianolson/cbor_py/pull/21 +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 93fc7ee..0032a93 100644 +--- a/setup.py ++++ b/setup.py +@@ -16,13 +16,13 @@ + # Thanks! + # to Mic Bowman for a bunch of work and impetus on dumps(,sort_keys=) + ++from setuptools import setup, Extension ++ + from distutils.command.build_ext import build_ext + from distutils.errors import (CCompilerError, DistutilsExecError, + DistutilsPlatformError) + import sys + +-from setuptools import setup, Extension +- + + build_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError) + if sys.platform == 'win32' and sys.version_info > (2, 6): +-- +2.35.1 +
