diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-01-09 16:02:05 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-01-09 16:02:05 +0000 |
| commit | 58fe88c47e902f2031bd77d37379f0df33d457c8 (patch) | |
| tree | 6bcbb342813c79daeba292ccd68065c1fa1c0fdd | |
| parent | Merge branch 'master' into develop (diff) | |
| parent | debian: Remove Breaks: matrix-synapse-ldap3 (diff) | |
| download | synapse-58fe88c47e902f2031bd77d37379f0df33d457c8.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 1 |
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) |