From b730480abbb31ce0e9c9957ef30dfcd0c646a1b1 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Thu, 2 Apr 2020 11:30:49 +0100
Subject: [PATCH 1/4] 1.12.1

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

diff --git a/CHANGES.md b/CHANGES.md
index a77768de5..e5608baa1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.12.1 (2020-04-02)
+===========================
+
+No significant changes since 1.12.1rc1.
+
+
 Synapse 1.12.1rc1 (2020-03-31)
 ==============================
 
diff --git a/debian/changelog b/debian/changelog
index 39ec9da7a..8e14e59c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.12.1) stable; urgency=medium
+
+  * New synapse release 1.12.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 02 Apr 2020 11:30:47 +0000
+
 matrix-synapse-py3 (1.12.0) stable; urgency=medium
 
   * New synapse release 1.12.0.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index c3c5b20f1..5df7d51ab 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.12.1rc1"
+__version__ = "1.12.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

From ec56620ff66aa06953b2d675e71df177ef7f375d Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Thu, 2 Apr 2020 18:08:03 +0100
Subject: [PATCH 2/4] Pin Pillow>=4.3.0,<7.1.0 to fix dep issue

---
 synapse/python_dependencies.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 8de8cb2c1..3274eb986 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -61,7 +61,9 @@ REQUIREMENTS = [
     "pyasn1-modules>=0.0.7",
     "daemonize>=2.3.1",
     "bcrypt>=3.1.0",
-    "pillow>=4.3.0",
+    # Pillow 7.1.0 causes the following issue on debian buster:
+    # https://github.com/python-pillow/Pillow/issues/2377
+    "pillow>=4.3.0,<7.1.0",
     "sortedcontainers>=1.4.4",
     "pymacaroons>=0.13.0",
     "msgpack>=0.5.2",

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 3/4] 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 e5608baa1..1ac3c6004 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 8e14e59c0..03b30cd12 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 5df7d51ab..bdad75113 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

From f7d6e849b35bef390c5234d1309a301dd04f8330 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Thu, 2 Apr 2020 19:08:06 +0100
Subject: [PATCH 4/4] Fix changelog wording

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1ac3c6004..5cec3d817 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,7 +1,7 @@
 Synapse 1.12.2 (2020-04-02)
 ===========================
 
-This release fixes [an
+This release works around [an
 issue](https://github.com/matrix-org/synapse/issues/7208) with building the
 debian packages.