diff options
| author | Stefano Rivera <stefanor@debian.org> | 2022-11-13 10:04:41 +0200 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2022-11-15 16:39:11 +0000 |
| commit | 3125cace8bd19a6c26000c415fe8e45cd21ddaa7 (patch) | |
| tree | 39e2d8b31551b93b15d6e502f38a5cbfd5d61f86 | |
| parent | b4f873434d1b7e366d4bd635e6490b04c702303c (diff) | |
| parent | 95ea469c9e13b172ace40b8ae662a5c17c5c385c (diff) | |
1.0.0-1.2 (patches applied)applied/1.0.0-1.2applied/debian/bookworm
Imported using git-ubuntu import.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/copyright | 4 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/setuptools-60 | 42 | ||||
| -rw-r--r-- | setup.py | 4 |
6 files changed, 56 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 140e0bd..a485997 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <stefanor@debian.org> Sun, 13 Nov 2022 10:04:41 +0200 + python-cbor (1.0.0-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 3a4db3f..c32beea 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), 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 --git a/debian/copyright b/debian/copyright index 4d50dea..20c0dee 100644 --- a/debian/copyright +++ b/debian/copyright @@ -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 --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..092d259 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +setuptools-60 diff --git a/debian/patches/setuptools-60 b/debian/patches/setuptools-60 new file mode 100644 index 0000000..ad46360 --- /dev/null +++ b/debian/patches/setuptools-60 @@ -0,0 +1,42 @@ +From 36507492af9e51a95fe2514e07d283b30b812dd6 Mon Sep 17 00:00:00 2001 +From: Stefano Rivera <stefano@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 + @@ -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): |