summary refs log tree commit diff
path: root/debian/control
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-01-24 14:51:35 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-01-24 14:51:35 +0000
commitacaca1b4e97b062ab0f926794435b901b7a3fa4e (patch)
tree79c9381f3e82d0c4ded96485988adb6d9016a910 /debian/control
parentFix missing synapse metrics import (diff)
parentisort (diff)
downloadsynapse-acaca1b4e97b062ab0f926794435b901b7a3fa4e.tar.xz
Merge branch 'anoa/room_dir_quick_fix' into matrix-org-hotfixes
Diffstat (limited to 'debian/control')
-rw-r--r--debian/control8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/control b/debian/control

index 634f04284a..4abfa02051 100644 --- a/debian/control +++ b/debian/control
@@ -19,16 +19,16 @@ Homepage: https://github.com/matrix-org/synapse Package: matrix-synapse-py3 Architecture: amd64 Provides: matrix-synapse -Breaks: - matrix-synapse (<< 0.34.0-0matrix2), - matrix-synapse (>= 0.34.0-1), +Conflicts: + matrix-synapse (<< 0.34.0.1-0matrix2), + matrix-synapse (>= 0.34.0.1-1), Pre-Depends: dpkg (>= 1.16.1) Depends: adduser, debconf, python3-distutils|libpython3-stdlib (<< 3.6), - python3, ${misc:Depends}, + ${synapse:pydepends}, # some of our scripts use perl, but none of them are important, # so we put perl:Depends in Suggests rather than Depends. Suggests: