From 29f20a8a1abf2e2450a1df0202dd1c02b6873701 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Fri, 4 Jan 2019 17:24:13 +0000
Subject: Update debian Conflicts specifications (#4349)

...  to allow installation alongside our matrix-synapse transitional package.
---
 debian/control | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'debian/control')

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,
-- 
cgit 1.4.1