summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-13 10:27:16 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-13 10:27:16 +0100
commit58e583eac1204e6eee6ee924a798180542f1e2c0 (patch)
tree70709a063bf86b9b77cec9984eef8e4726988f62
parentExplicitly install test dependencies when building deb packages (#8523) (diff)
downloadsynapse-58e583eac1204e6eee6ee924a798180542f1e2c0.tar.xz
-rw-r--r--CHANGES.md6
-rw-r--r--debian/changelog8
-rw-r--r--synapse/__init__.py2
3 files changed, 13 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index dec2630130..75dc5fa893 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.21.1 (2020-10-13)
+===========================
+
+This release fixes a regression in v1.21.0 that prevented debian packages from being built.
+It is otherwise identical to v1.21.0.
+
 Synapse 1.21.0 (2020-10-12)
 ===========================
 
diff --git a/debian/changelog b/debian/changelog
index 27b6708115..eeafd4f50a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-matrix-synapse-py3 (1.21.0+nmu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.21.1) stable; urgency=medium
 
+  [ Synapse Packaging team ]
+  * New synapse release 1.21.1.
+
+  [ Andrew Morgan ]
   * Explicitly install "test" python dependencies.
 
- -- Andrew Morgan <andrewm@matrix.org>  Mon, 12 Oct 2020 17:30:30 +0100
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 13 Oct 2020 10:24:13 +0100
 
 matrix-synapse-py3 (1.21.0) stable; urgency=medium
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 57f818125a..722b53a67d 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.21.0"
+__version__ = "1.21.1"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when