Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Richard van der Hoff 2019-01-09 16:02:05 +00:00
parent d566e6b17a 2394e832a8
commit 58fe88c47e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -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 matrix-synapse-py3 (0.34.1) stable; urgency=medium
* New synapse release 0.34.1. * New synapse release 0.34.1.

1
debian/control vendored
View File

@ -20,7 +20,6 @@ Package: matrix-synapse-py3
Architecture: amd64 Architecture: amd64
Provides: matrix-synapse Provides: matrix-synapse
Breaks: Breaks:
matrix-synapse-ldap3,
matrix-synapse (<< 0.34.0-0matrix2), matrix-synapse (<< 0.34.0-0matrix2),
matrix-synapse (>= 0.34.0-1), matrix-synapse (>= 0.34.0-1),
Pre-Depends: dpkg (>= 1.16.1) Pre-Depends: dpkg (>= 1.16.1)