diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-13 10:33:58 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-13 10:33:58 +0100 |
commit | a9a8f29729201ccb6a501cb1a31552ee4a1dd692 (patch) | |
tree | dbfd0346f429237bf10969b00b2363c78e55f05e /debian | |
parent | Multi arch docker support: add arm/v7 and arm64 to our docker images (#7921) (diff) | |
parent | 1.21.1 (diff) | |
download | synapse-a9a8f29729201ccb6a501cb1a31552ee4a1dd692.tar.xz |
Merge branch 'master' into develop
* master: 1.21.1 Explicitly install test dependencies when building deb packages (#8523)
Diffstat (limited to 'debian')
-rwxr-xr-x | debian/build_virtualenv | 2 | ||||
-rw-r--r-- | debian/changelog | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/build_virtualenv b/debian/build_virtualenv index 4c9aabcac3..cbdde93f96 100755 --- a/debian/build_virtualenv +++ b/debian/build_virtualenv @@ -42,7 +42,7 @@ dh_virtualenv \ --preinstall="mock" \ --extra-pip-arg="--no-cache-dir" \ --extra-pip-arg="--compile" \ - --extras="all,systemd" + --extras="all,systemd,test" PACKAGE_BUILD_DIR="debian/matrix-synapse-py3" VIRTUALENV_DIR="${PACKAGE_BUILD_DIR}${DH_VIRTUALENV_INSTALL_ROOT}/matrix-synapse" diff --git a/debian/changelog b/debian/changelog index a08782f587..eeafd4f50a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +matrix-synapse-py3 (1.21.1) stable; urgency=medium + + [ Synapse Packaging team ] + * New synapse release 1.21.1. + + [ Andrew Morgan ] + * Explicitly install "test" python dependencies. + + -- Synapse Packaging team <packages@matrix.org> Tue, 13 Oct 2020 10:24:13 +0100 + matrix-synapse-py3 (1.21.0) stable; urgency=medium * New synapse release 1.21.0. |