diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-01-12 13:30:30 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-01-12 13:30:30 +0000 |
| commit | 7e41545e8b6761b1a4ccc94778d17c96a2d1e3ab (patch) | |
| tree | 91b3c36e6cbe729cce551504183af38d86aeaf1b /debian | |
| parent | Silence travis-ci build warnings by removing non-functional python3.6 (#4377) (diff) | |
| parent | moar plusses! (diff) | |
| download | synapse-7e41545e8b6761b1a4ccc94778d17c96a2d1e3ab.tar.xz | |
Merge branch 'release-v0.34.1.1' into develop
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 09bb0001e5..e6c174e02d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (0.34.1.1++1) stable; urgency=medium + + * Update conflicts specifications to allow smoother transition from matrix-synapse. + + -- Synapse Packaging team <packages@matrix.org> Sat, 12 Jan 2019 12:58:35 +0000 + matrix-synapse-py3 (0.34.1.1) stable; urgency=high * New synapse release 0.34.1.1 diff --git a/debian/control b/debian/control index 634f04284a..b85e36c6ca 100644 --- a/debian/control +++ b/debian/control @@ -19,9 +19,9 @@ Homepage: https://github.com/matrix-org/synapse Package: matrix-synapse-py3 Architecture: amd64 Provides: matrix-synapse -Breaks: - matrix-synapse (<< 0.34.0-0matrix2), - matrix-synapse (>= 0.34.0-1), +Conflicts: + matrix-synapse (<< 0.34.0.1-0matrix2), + matrix-synapse (>= 0.34.0.1-1), Pre-Depends: dpkg (>= 1.16.1) Depends: adduser, |