diff options
| author | Erik Johnston <erik@matrix.org> | 2021-01-13 10:36:55 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-01-13 10:36:55 +0000 |
| commit | aa4d8c1f9aa32693412642650a7c626e164af286 (patch) | |
| tree | eda7203d761213e14854fd8972c8e693dd1396ff /debian | |
| parent | Preparatory refactors of OidcHandler (#9067) (diff) | |
| parent | Move removal warning up changelog (diff) | |
| download | synapse-aa4d8c1f9aa32693412642650a7c626e164af286.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/control | 6 |
2 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 6b819d201d..609436bf75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +matrix-synapse-py3 (1.25.0) stable; urgency=medium + + [ Dan Callahan ] + * Update dependencies to account for the removal of the transitional + dh-systemd package from Debian Bullseye. + + [ Synapse Packaging team ] + * New synapse release 1.25.0. + + -- Synapse Packaging team <packages@matrix.org> Wed, 13 Jan 2021 10:14:55 +0000 + matrix-synapse-py3 (1.24.0) stable; urgency=medium * New synapse release 1.24.0. diff --git a/debian/control b/debian/control index bae14b41e4..b10401be43 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,11 @@ Section: contrib/python Priority: extra Maintainer: Synapse Packaging team <packages@matrix.org> # keep this list in sync with the build dependencies in docker/Dockerfile-dhvirtualenv. +# TODO: Remove the dependency on dh-systemd after dropping support for Ubuntu xenial +# On all other supported releases, it's merely a transitional package which +# does nothing but depends on debhelper (> 9.20160709) Build-Depends: - debhelper (>= 9), - dh-systemd, + debhelper (>= 9.20160709) | dh-systemd, dh-virtualenv (>= 1.1), libsystemd-dev, libpq-dev, |