diff options
author | Eric Eastwood <erice@element.io> | 2022-09-09 16:28:05 -0500 |
---|---|---|
committer | Eric Eastwood <erice@element.io> | 2022-09-09 16:28:05 -0500 |
commit | 50f0342594977a57793225d8f6b95e1225dfe308 (patch) | |
tree | bb8c94e3316a8623780d37a98e1f55aa2bc19c4a /debian/control | |
parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
parent | Concurrently collect room unread counts for push badges (#13765) (diff) | |
download | synapse-50f0342594977a57793225d8f6b95e1225dfe308.tar.xz |
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts: poetry.lock synapse/api/auth.py synapse/federation/federation_client.py synapse/logging/opentracing.py synapse/rest/client/keys.py synapse/rest/client/sendtodevice.py synapse/storage/schema/__init__.py
Diffstat (limited to 'debian/control')
-rw-r--r-- | debian/control | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 412a9e1d4c..86f5a66d02 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Synapse Packaging team <packages@matrix.org> # keep this list in sync with the build dependencies in docker/Dockerfile-dhvirtualenv. Build-Depends: - debhelper (>= 10), + debhelper-compat (= 12), dh-virtualenv (>= 1.1), libsystemd-dev, libpq-dev, |