From 599d69729257ffc0503487970aed859261ed2c1d Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 3 Jun 2020 10:26:54 +0100 Subject: [PATCH 1/2] Switch back to upstream dh-virtualenv Upstream have merged our changes (https://github.com/spotify/dh-virtualenv/pull/300), so let's switch back to it instead of using our fork. --- docker/Dockerfile-dhvirtualenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv index bf6af74104cc..619585d5faf2 100644 --- a/docker/Dockerfile-dhvirtualenv +++ b/docker/Dockerfile-dhvirtualenv @@ -28,7 +28,7 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get install \ # fetch and unpack the package RUN mkdir /dh-virtualenv -RUN wget -q -O /dh-virtualenv.tar.gz https://github.com/matrix-org/dh-virtualenv/archive/matrixorg-20200519.tar.gz +RUN wget -q -O /dh-virtualenv.tar.gz https://github.com/spotify/dh-virtualenv/archive/ac6e1b1.tar.gz RUN tar -xv --strip-components=1 -C /dh-virtualenv -f /dh-virtualenv.tar.gz # install its build deps. We do another apt-cache-update here, because we might From dac5f10ea82dd1155c8b22f927d51c8c7ad5a651 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 3 Jun 2020 10:28:32 +0100 Subject: [PATCH 2/2] changelog --- changelog.d/7621.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/7621.misc diff --git a/changelog.d/7621.misc b/changelog.d/7621.misc new file mode 100644 index 000000000000..032a7de6e678 --- /dev/null +++ b/changelog.d/7621.misc @@ -0,0 +1 @@ +Switch to upstream `dh-virtualenv` rather than our fork for Debian package builds.