From 08edefe694a59294aae1f24df31ec09979987a95 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Thu, 2 Apr 2020 19:02:45 +0100
Subject: [PATCH] 1.12.2

---
 CHANGES.md          | 10 ++++++++++
 debian/changelog    |  6 ++++++
 synapse/__init__.py |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index e5608baa11..1ac3c60043 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+Synapse 1.12.2 (2020-04-02)
+===========================
+
+This release fixes [an
+issue](https://github.com/matrix-org/synapse/issues/7208) with building the
+debian packages.
+
+No other significant changes since 1.12.1.
+
+
 Synapse 1.12.1 (2020-04-02)
 ===========================
 
diff --git a/debian/changelog b/debian/changelog
index 8e14e59c0d..03b30cd12f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.12.2) stable; urgency=medium
+
+  * New synapse release 1.12.2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 02 Apr 2020 19:02:17 +0000
+
 matrix-synapse-py3 (1.12.1) stable; urgency=medium
 
   * New synapse release 1.12.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 5df7d51ab1..bdad75113d 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.12.1"
+__version__ = "1.12.2"
 
 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