diff --git a/debian/changelog b/debian/changelog index 5e0722e..600a3c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,44 @@ +python-nacl (1.5.0-8) unstable; urgency=medium + + * Team upload. + * Fix d/watch for new PyPi archive naming convention + * Use dh-sequence-python3 + * Bump Standards-Version to 4.7.2 + + -- Alexandre Detiste Wed, 24 Sep 2025 18:05:00 +0200 + +python-nacl (1.5.0-7) unstable; urgency=medium + + * Fix documentation build for Sphinx 8.0 (closes: #1090152). + + -- Colin Watson Mon, 16 Dec 2024 23:26:27 +0000 + +python-nacl (1.5.0-6) unstable; urgency=medium + + * Build bindings reproducibly. + + -- Colin Watson Mon, 26 Aug 2024 18:16:49 +0100 + +python-nacl (1.5.0-5) unstable; urgency=medium + + [ Alexandre Detiste ] + * Remove extraneous python3-six build dependency. + + [ Colin Watson ] + * Switch to autopkgtest-pkg-pybuild. + + -- Colin Watson Mon, 26 Aug 2024 15:33:11 +0100 + +python-nacl (1.5.0-4) unstable; urgency=medium + + [ Scott Kitterman ] + * Remove dh-clean override which deleted the vendored libsodium, no longer + needed and left source tree dirty after clean + * Add d/source/options extend-diff-ignore to fix dpkg-source failure due to + local changes (python package metadata regeneration; closes: #1045310) + + -- Colin Watson Mon, 14 Aug 2023 11:51:47 +0100 + python-nacl (1.5.0-3) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 16b0e69..e7b35c6 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Section: python Priority: optional Build-Depends: debhelper-compat (= 13), - dh-python, + dh-sequence-python3, pybuild-plugin-pyproject, libsodium-dev (>= 1.0.16), python3-all-dev, @@ -15,13 +15,13 @@ Build-Depends: python3-hypothesis (>= 4.36.2), python3-pytest, python3-setuptools, - python3-six, python3-sphinx, python3-wheel, -Standards-Version: 4.6.2 +Standards-Version: 4.7.2 Homepage: https://github.com/pyca/pynacl/ Vcs-Git: https://salsa.debian.org/python-team/packages/python-nacl.git Vcs-Browser: https://salsa.debian.org/python-team/packages/python-nacl +Testsuite: autopkgtest-pkg-pybuild Package: python3-nacl Architecture: any diff --git a/debian/patches/0001-remove-privacy-breach-images.patch b/debian/patches/0001-remove-privacy-breach-images.patch index a6b3e56..93f97d8 100644 --- a/debian/patches/0001-remove-privacy-breach-images.patch +++ b/debian/patches/0001-remove-privacy-breach-images.patch @@ -3,13 +3,13 @@ Date: Tue, 26 May 2020 03:53:46 -0400 Subject: remove privacy-breach images --- - README.rst | 14 -------------- - 1 file changed, 14 deletions(-) + README.rst | 11 ----------- + 1 file changed, 11 deletions(-) -Index: python-nacl/README.rst -=================================================================== ---- python-nacl.orig/README.rst -+++ python-nacl/README.rst +diff --git a/README.rst b/README.rst +index 89014db..32c1e1e 100644 +--- a/README.rst ++++ b/README.rst @@ -2,17 +2,6 @@ PyNaCl: Python binding to the libsodium library =============================================== diff --git a/debian/patches/reproducible-bindings.patch b/debian/patches/reproducible-bindings.patch new file mode 100644 index 0000000..2fb56ae --- /dev/null +++ b/debian/patches/reproducible-bindings.patch @@ -0,0 +1,38 @@ +From: Colin Watson +Date: Mon, 26 Aug 2024 17:48:49 +0100 +Subject: Build bindings reproducibly + +`glob` output isn't guaranteed to be in any particular order, so +`_sodium.*.so` wasn't always reproducible. + +Forwarded: https://github.com/pyca/pynacl/pull/836 +Last-Update: 2024-08-26 +--- + src/bindings/build.py | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/bindings/build.py b/src/bindings/build.py +index 9634237..777237b 100644 +--- a/src/bindings/build.py ++++ b/src/bindings/build.py +@@ -22,12 +22,16 @@ from cffi import FFI + __all__ = ["ffi"] + + +-HEADERS = glob.glob( +- os.path.join(os.path.abspath(os.path.dirname(__file__)), "*.h") ++HEADERS = sorted( ++ glob.glob(os.path.join(os.path.abspath(os.path.dirname(__file__)), "*.h")) + ) + +-MINIMAL_HEADERS = glob.glob( +- os.path.join(os.path.abspath(os.path.dirname(__file__)), "minimal", "*.h") ++MINIMAL_HEADERS = sorted( ++ glob.glob( ++ os.path.join( ++ os.path.abspath(os.path.dirname(__file__)), "minimal", "*.h" ++ ) ++ ) + ) + + diff --git a/debian/patches/series b/debian/patches/series index 5724f27..2537790 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ 0001-remove-privacy-breach-images.patch +reproducible-bindings.patch +sphinx-8.0.patch diff --git a/debian/patches/sphinx-8.0.patch b/debian/patches/sphinx-8.0.patch new file mode 100644 index 0000000..8a4004b --- /dev/null +++ b/debian/patches/sphinx-8.0.patch @@ -0,0 +1,25 @@ +From: Paul Kehrer +Date: Mon, 16 Dec 2024 23:21:39 +0000 +Subject: Fix documentation build for Sphinx 8.0 + +Origin: backport, https://github.com/pyca/pynacl/pull/793 +Bug-Debian: https://bugs.debian.org/1090152 +Last-Update: 2024-12-16 +--- + docs/conf.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/docs/conf.py b/docs/conf.py +index 3337cd2..09c8a3b 100644 +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -177,8 +177,7 @@ html_static_path = ["_static"] + htmlhelp_basename = "PyNaCldoc" + + +-# Example configuration for intersphinx: refer to the Python standard library. +-intersphinx_mapping = {"http://docs.python.org/": None} ++intersphinx_mapping = {"python": ("https://docs.python.org/3", None)} + + # Retry requests in the linkcheck builder so that we're resilient against + # transient network errors. diff --git a/debian/rules b/debian/rules index f826cbd..9136a2b 100755 --- a/debian/rules +++ b/debian/rules @@ -18,14 +18,7 @@ export SODIUM_INSTALL=system %: - dh $@ --with python3,sphinxdoc --buildsystem=pybuild - - -override_dh_clean: - dh_clean - # Remove the vendored libsodium just to make sure we don't build - # against it - rm -rf src/libsodium + dh $@ --with sphinxdoc --buildsystem=pybuild override_dh_auto_clean: @@ -40,6 +33,5 @@ ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) endif -override_dh_python3: - dh_python3 +execute_after_dh_python3: rm -rf debian/python3-nacl/usr/lib/python3.? diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..98d8c8f --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +extend-diff-ignore = "^src/[^/]*[.]egg-info/" diff --git a/debian/tests/control b/debian/tests/control deleted file mode 100644 index d27ef48..0000000 --- a/debian/tests/control +++ /dev/null @@ -1,3 +0,0 @@ -Tests: python3 -Depends: @, @builddeps@ -Restrictions: needs-root diff --git a/debian/tests/python3 b/debian/tests/python3 deleted file mode 100644 index f90d33d..0000000 --- a/debian/tests/python3 +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e -SRC="${PWD}" - -cd "${AUTOPKGTEST_TMP}" -for py in $(py3versions -vs) ; do - python$py -m pytest ${SRC}/tests -done diff --git a/debian/watch b/debian/watch index d716f01..87efe5c 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=4 -opts=uversionmangle=s/(rc|a|b|c)/~$1/,pgpsigurlmangle=s/$/.asc/ https://pypi.debian.net/PyNaCl/PyNaCl-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +opts=uversionmangle=s/(rc|a|b|c)/~$1/,pgpsigurlmangle=s/$/.asc/ https://pypi.debian.net/PyNaCl/pynacl-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))