From 9d9621585d4d3c0586fd8f1284b2f5608ea55af5 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 28 Sep 2021 11:35:37 +0100
Subject: [PATCH 1/2] Fix debian package builds.

This was due to dh-virtualenv builds being broken due to Shpinx removing
deprecated APIs.
---
 docker/Dockerfile-dhvirtualenv | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv
index 017be8555ea9..1dd88140c7a4 100644
--- a/docker/Dockerfile-dhvirtualenv
+++ b/docker/Dockerfile-dhvirtualenv
@@ -47,8 +47,9 @@ RUN apt-get update -qq -o Acquire::Languages=none \
     && cd /dh-virtualenv \
     && env DEBIAN_FRONTEND=noninteractive mk-build-deps -ri -t "apt-get -y --no-install-recommends"
 
-# build it
-RUN cd /dh-virtualenv && dpkg-buildpackage -us -uc -b
+# Build it. Note that building the docs doesn't work due to differences in
+# Sphinx APIs across versions/distros.
+RUN cd /dh-virtualenv && DEB_BUILD_OPTIONS=nodoc dpkg-buildpackage -us -uc -b
 
 ###
 ### Stage 1

From a68e454edd1e1a9519a3dbc174cba226a84de3b3 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 28 Sep 2021 11:37:08 +0100
Subject: [PATCH 2/2] Newsfile

---
 changelog.d/10931.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/10931.bugfix

diff --git a/changelog.d/10931.bugfix b/changelog.d/10931.bugfix
new file mode 100644
index 000000000000..3f30c9ccf158
--- /dev/null
+++ b/changelog.d/10931.bugfix
@@ -0,0 +1 @@
+Fix debian builds due to dh-virtualenv no longer being able to build their docs.