From 91fa34b3fa93eded7aad45dcc44885124ad76960 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 11 Jan 2019 17:05:45 +0000 Subject: [PATCH] s/Breaks/Conflicts/ in debian/control Otherwise people can't upgrade from matrix-synapse without removing it first --- debian/changelog | 6 ++++++ debian/control | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 09bb0001e..29d55496e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 11 Jan 2019 17:04:28 +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 634f04284..b85e36c6c 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,