summary refs log tree commit diff
path: root/debian/control
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-01-04 17:24:13 +0000
committerGitHub <noreply@github.com>2019-01-04 17:24:13 +0000
commit29f20a8a1abf2e2450a1df0202dd1c02b6873701 (patch)
tree20069d248dc98443c0e7a14c0b18cb82fd9aa9a4 /debian/control
parentfix NPE in /messages by checking if all events were filtered out (#4330) (diff)
downloadsynapse-29f20a8a1abf2e2450a1df0202dd1c02b6873701.tar.xz
Update debian Conflicts specifications (#4349)
...  to allow installation alongside our matrix-synapse transitional package.
Diffstat (limited to '')
-rw-r--r--debian/control8
1 files changed, 6 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index 9606a4c135..500348bc9a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,12 +13,16 @@ Build-Depends:
  python3-pip,
  python3-venv,
  tar,
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
 Homepage: https://github.com/matrix-org/synapse
 
 Package: matrix-synapse-py3
 Architecture: amd64
-Conflicts: matrix-synapse
+Provides: matrix-synapse
+Breaks:
+ matrix-synapse-ldap3,
+ matrix-synapse (<< 0.34.0-0matrix2),
+ matrix-synapse (>= 0.34.0-1),
 Pre-Depends: dpkg (>= 1.16.1)
 Depends:
  adduser,