s/Breaks/Conflicts/ in debian/control

Otherwise people can't upgrade from matrix-synapse without removing it first
This commit is contained in:
Richard van der Hoff 2019-01-11 17:05:45 +00:00
parent c0dba73aa0
commit 91fa34b3fa
2 changed files with 9 additions and 3 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
matrix-synapse-py3 (0.34.1.1+1) UNRELEASED; urgency=medium
* Update conflicts specifications to allow smoother transition from matrix-synapse.
-- Synapse Packaging team <packages@matrix.org> Fri, 11 Jan 2019 17:04:28 +0000
matrix-synapse-py3 (0.34.1.1) stable; urgency=high matrix-synapse-py3 (0.34.1.1) stable; urgency=high
* New synapse release 0.34.1.1 * New synapse release 0.34.1.1

6
debian/control vendored
View File

@ -19,9 +19,9 @@ Homepage: https://github.com/matrix-org/synapse
Package: matrix-synapse-py3 Package: matrix-synapse-py3
Architecture: amd64 Architecture: amd64
Provides: matrix-synapse Provides: matrix-synapse
Breaks: Conflicts:
matrix-synapse (<< 0.34.0-0matrix2), matrix-synapse (<< 0.34.0.1-0matrix2),
matrix-synapse (>= 0.34.0-1), matrix-synapse (>= 0.34.0.1-1),
Pre-Depends: dpkg (>= 1.16.1) Pre-Depends: dpkg (>= 1.16.1)
Depends: Depends:
adduser, adduser,