Merge branch 'master' into develop

2 files changed, 8 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog

index 95edf92206..921f7021d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+matrix-synapse-py3 (0.34.1+1) stable; urgency=medium
+
+  * Remove 'Breaks: matrix-synapse-ldap3'. (matrix-synapse-py3 includes
+    the matrix-synapse-ldap3 python files, which makes the
+    matrix-synapse-ldap3 debian package redundant but not broken.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 09 Jan 2019 15:30:00 +0000
+
 matrix-synapse-py3 (0.34.1) stable; urgency=medium
 
   * New synapse release 0.34.1.
diff --git a/debian/control b/debian/control

index 500348bc9a..634f04284a 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Package: matrix-synapse-py3
 Architecture: amd64
 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)