Biting the Debian bullet

.github/workflows/ci.yml

@@ -194,7 +194,7 @@ jobs:
         if: matrix.distro == 'debian' && matrix.version == 'bookworm'
         uses: actions/upload-artifact@v4
         with:
-          name: dangerzone.deb
+          name: dangerzone-${{matrix.distro}}-${{matrix-version}}.deb
           path: "deb_dist/dangerzone_*_*.deb"
 
   install-deb:
@@ -230,7 +230,7 @@ jobs:
       - name: Download Dangerzone .deb
         uses: actions/download-artifact@v4
         with:
-          name: dangerzone.deb
+          name: dangerzone-${{matrix.distro}}-${{matrix-version}}.deb
           path: "deb_dist/"
 
       - name: Build end-user environment

debian/control

@@ -2,14 +2,14 @@ Source: dangerzone
 Maintainer: Freedom of the Press Foundation <[email protected]>
 Section: python
 Priority: optional
-Build-Depends: dh-python, python3-setuptools, python3 (>= 3.9) | python3.9, dpkg-dev, debhelper (>= 9)
+Build-Depends: dh-python, python3-setuptools, python3, dpkg-dev, debhelper (>= 9)
 Standards-Version: 4.5.1
 Homepage: https://github.com/freedomofpress/dangerzone
 Rules-Requires-Root: no
 
 Package: dangerzone
 Architecture: any
-Depends: ${misc:Depends}, python3 (>= 3.9) | python3.9, podman, python3-pyside2.qtcore, python3-pyside2.qtgui, python3-pyside2.qtwidgets, python3-pyside2.qtsvg, python3-appdirs, python3-click, python3-xdg, python3-colorama, python3-requests, python3-markdown, python3-packaging
+Depends: ${misc:Depends}, ${python3:Depends}, podman, python3, python3-pyside2.qtcore, python3-pyside2.qtgui, python3-pyside2.qtwidgets, python3-pyside2.qtsvg, python3-appdirs, python3-click, python3-xdg, python3-colorama, python3-requests, python3-markdown, python3-packaging
 Description: Take potentially dangerous PDFs, office documents, or images
   Dangerzone is an open source desktop application that takes potentially dangerous PDFs, office documents, or images and converts them to safe PDFs. It uses disposable VMs on Qubes OS, or container technology in other OSes, to convert the documents within a secure sandbox.
   .

debian/rules

@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 export PYBUILD_NAME=dangerzone
 export DEB_BUILD_OPTIONS=nocheck
-export PYBUILD_INSTALL_ARGS=--install-lib=/usr/lib/python3/dist-packages
-export PYTHONDONTWRITEBYTECODE=1
-export DH_VERBOSE=1
+#export PYBUILD_INSTALL_ARGS=--install-lib=/usr/lib/python3/dist-packages
+#export PYTHONDONTWRITEBYTECODE=1
+#export DH_VERBOSE=1
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild