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: [PATCH] Update debian Conflicts specifications (#4349)

...  to allow installation alongside our matrix-synapse transitional package.
---
 changelog.d/4349.misc | 1 +
 debian/changelog      | 7 +++++++
 debian/control        | 8 ++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/4349.misc

diff --git a/changelog.d/4349.misc b/changelog.d/4349.misc
new file mode 100644
index 0000000000..61bd4439cb
--- /dev/null
+++ b/changelog.d/4349.misc
@@ -0,0 +1 @@
+Update debian packaging for compatibility with transitional package
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 040c8e7cd3..fc8218bee7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+matrix-synapse-py3 (0.34.0.1) UNRELEASED; urgency=medium
+
+  * Update Conflicts specifications to allow installation alongside our
+    matrix-synapse transitional package.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 02 Jan 2019 17:48:40 +0000
+
 matrix-synapse-py3 (0.34.0) stable; urgency=medium
 
   * New synapse release 0.34.0.
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,