Control: tags -1 + pending Hi all,
On Mon, Apr 14, 2025 at 04:42:00PM +0300, Dmitry Shachnev wrote: > Okay, I will NMU setuptools then, and then NMU mat2 with bumped dependency > on setuptools. After some discussion we decided that it's better to fix dh-python, not setuptools, and Stefano uploaded a fix [1]. And I have just uploaded a mat2 NMU with bumped dependency on dh-python to DELAYED/1-day. Since it's an Architecture: all package, a binNMU is not possible unfortunately. Attached a debdiff, and also a diff of the binary package contents when building against old and new dh-python (changelog changes were not included). I have also submitted a merge request on salsa [2], which is based on top of Otto's first MR. Right now the pipeline failed because the new dh-python is not available yet, but I will retry it later and make sure it passes. [1]: https://tracker.debian.org/news/1639558/accepted-dh-python-620250414-source-into-unstable/ [2]: https://salsa.debian.org/pkg-privacy-team/mat2/-/merge_requests/5 -- Dmitry Shachnev
diff -Nru mat2-0.13.5/debian/changelog mat2-0.13.5/debian/changelog --- mat2-0.13.5/debian/changelog 2025-04-11 19:46:13.000000000 +0300 +++ mat2-0.13.5/debian/changelog 2025-04-15 00:18:16.000000000 +0300 @@ -1,3 +1,11 @@ +mat2 (0.13.5-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Build-depend on dh-python >= 6.20250414, to make sure that a correct + shebang is generated. (Closes: #1103044) + + -- Dmitry Shachnev <[email protected]> Tue, 15 Apr 2025 00:18:16 +0300 + mat2 (0.13.5-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru mat2-0.13.5/debian/control mat2-0.13.5/debian/control --- mat2-0.13.5/debian/control 2025-01-09 10:55:40.000000000 +0300 +++ mat2-0.13.5/debian/control 2025-04-15 00:18:16.000000000 +0300 @@ -5,7 +5,7 @@ Uploaders: Georg Faerber <[email protected]>, Jonas Meurer <[email protected]>, Build-Depends: debhelper-compat (= 13), - dh-python, + dh-python (>= 6.20250414~), ffmpeg, gir1.2-gdkpixbuf-2.0, gir1.2-poppler-0.18,
--- a/mat2-0.13.5/debian/mat2/DEBIAN/control +++ b/mat2-0.13.5/debian/mat2/DEBIAN/control @@ -3,7 +3,7 @@ Version: 0.13.5-1.1 Architecture: all Maintainer: Debian Privacy Tools Maintainers <[email protected]> Installed-Size: 246 -Depends: gir1.2-gdkpixbuf-2.0, gir1.2-poppler-0.18, gir1.2-rsvg-2.0, libimage-exiftool-perl, python3-gi-cairo, python3-mutagen, python2:any, python3-cairo, python3-gi, python3:any +Depends: gir1.2-gdkpixbuf-2.0, gir1.2-poppler-0.18, gir1.2-rsvg-2.0, libimage-exiftool-perl, python3-gi-cairo, python3-mutagen, python3-cairo, python3-gi, python3:any Recommends: bubblewrap, metadata-cleaner Suggests: ffmpeg Breaks: mat (<< 0.8.0-2~) --- a/mat2-0.13.5/debian/mat2/DEBIAN/md5sums +++ b/mat2-0.13.5/debian/mat2/DEBIAN/md5sums @@ -1,4 +1,4 @@ -0cf522572df0d9f1ee06409f4bc1be41 usr/bin/mat2 +9247043f9010469c91db6bf28bf7038b usr/bin/mat2 bf548245837f09342a1391e46bac559c usr/lib/python3/dist-packages/libmat2/__init__.py 6b8bb1c303f19b08f3810697bcb44438 usr/lib/python3/dist-packages/libmat2/abstract.py f183d6e8edebad615019e53cf6ecdfff usr/lib/python3/dist-packages/libmat2/archive.py --- a/mat2-0.13.5/debian/mat2/usr/bin/mat2 +++ b/mat2-0.13.5/debian/mat2/usr/bin/mat2 @@ -1,4 +1,4 @@ -#! /usr/bin/python2 +#! /usr/bin/python3 import os import shutil
signature.asc
Description: PGP signature
