diff options
author | Erik Johnston <erik@matrix.org> | 2021-11-02 14:28:27 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-11-02 14:28:27 +0000 |
commit | 237f7eb87ad097ecf40f945630ac49cef1aa1154 (patch) | |
tree | 2fb7f95f8130b4756b5603ff8994c687c8726a9e /debian | |
parent | Add remaining type hints to `synapse.events`. (#11098) (diff) | |
parent | Update changelog (diff) | |
download | synapse-237f7eb87ad097ecf40f945630ac49cef1aa1154.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 10 | ||||
-rwxr-xr-x | debian/rules | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 24842192b8..14748f8c25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,16 @@ matrix-synapse-py3 (1.47.0+nmu1) UNRELEASED; urgency=medium -- root <root@cae79a6e79d7> Fri, 22 Oct 2021 22:20:31 +0000 +matrix-synapse-py3 (1.46.0) stable; urgency=medium + + [ Richard van der Hoff ] + * Compress debs with xz, to fix incompatibility of impish debs with reprepro. + + [ Synapse Packaging team ] + * New synapse release 1.46.0. + + -- Synapse Packaging team <packages@matrix.org> Tue, 02 Nov 2021 13:22:53 +0000 + matrix-synapse-py3 (1.46.0~rc1) stable; urgency=medium * New synapse release 1.46.0~rc1. diff --git a/debian/rules b/debian/rules index b9d490adc9..5baf2475f0 100755 --- a/debian/rules +++ b/debian/rules @@ -51,5 +51,11 @@ override_dh_shlibdeps: override_dh_virtualenv: ./debian/build_virtualenv +override_dh_builddeb: + # force the compression to xzip, to stop dpkg-deb on impish defaulting to zstd + # (which requires reprepro 5.3.0-1.3, which is currently only in 'experimental' in Debian: + # https://metadata.ftp-master.debian.org/changelogs/main/r/reprepro/reprepro_5.3.0-1.3_changelog) + dh_builddeb -- -Zxz + %: dh $@ --with python-virtualenv |