From 5a786638ff04a0f8c970d8aa854322f6cc912656 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Jul 2024 11:38:09 +0100 Subject: [PATCH 1/3] Fix building debian packages for sid Sid now defaults to python3.12, and our pinned version of cffi (1.5.1) does not have wheels for 3.12. This installing cffi to fail as we did not have the correct libs installed to build from source. --- docker/Dockerfile-dhvirtualenv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv index b7679924c2..f000144567 100644 --- a/docker/Dockerfile-dhvirtualenv +++ b/docker/Dockerfile-dhvirtualenv @@ -73,6 +73,8 @@ RUN apt-get update -qq -o Acquire::Languages=none \ curl \ debhelper \ devscripts \ + # Required for building cffi from source. + libffi-dev \ libsystemd-dev \ lsb-release \ pkg-config \ From a7688de377aaef10076a2c983cf1205a28479295 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Jul 2024 11:40:37 +0100 Subject: [PATCH 2/3] Newsfile --- changelog.d/17389.debian | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/17389.debian diff --git a/changelog.d/17389.debian b/changelog.d/17389.debian new file mode 100644 index 0000000000..7022ed93d9 --- /dev/null +++ b/changelog.d/17389.debian @@ -0,0 +1 @@ +Fix building debian package for debian sid. From dbaaf7c4961ba6c4372b1e14674368f2eefdfbe2 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Jul 2024 11:44:24 +0100 Subject: [PATCH 3/3] Newsfile --- changelog.d/{17389.debian => 17389.misc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog.d/{17389.debian => 17389.misc} (100%) diff --git a/changelog.d/17389.debian b/changelog.d/17389.misc similarity index 100% rename from changelog.d/17389.debian rename to changelog.d/17389.misc