Merge tag 'v0.34.1.1' into matrix-org-hotfixes

Synapse 0.34.1.1 (2019-01-11)
=============================

This release fixes CVE-2019-5885 and is recommended for all users of Synapse 0.34.1.

This release is compatible with Python 2.7 and 3.5+. Python 3.7 is fully supported.

Bugfixes
--------

- Fix spontaneous logout on upgrade
  ([\#4374](https://github.com/matrix-org/synapse/issues/4374))

2 files changed, 11 insertions, 3 deletions

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

index fc8218bee7..921f7021d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,18 @@
-matrix-synapse-py3 (0.34.0.1) UNRELEASED; urgency=medium
+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.
   * 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
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 09 Jan 2019 14:52:24 +0000
 
 matrix-synapse-py3 (0.34.0) stable; urgency=medium
 
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)