mirror of
https://github.com/element-hq/synapse
synced 2024-09-03 05:00:19 +00:00
Merge branch 'master' into develop
This commit is contained in:
commit
58fe88c47e
2 changed files with 8 additions and 1 deletions
8
debian/changelog
vendored
8
debian/changelog
vendored
|
@ -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.
|
||||
|
|
1
debian/control
vendored
1
debian/control
vendored
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue