From aa874a13902fcf7f3e4024cd95a8491f308367bb Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 21 Dec 2021 17:32:16 +0000
Subject: [PATCH] 1.49.2

---
 CHANGES.md             | 13 ++++++++++++-
 changelog.d/11625.misc |  1 -
 debian/changelog       |  6 ++++++
 synapse/__init__.py    |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/11625.misc

diff --git a/CHANGES.md b/CHANGES.md
index dc6fa1779..9301ec880 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-Synapse 1.49.1 (2021-12-21)
+Synapse 1.49.2 (2021-12-21)
 ===========================
 
 This release fixes a regression introduced in Synapse 1.49.0 which could cause `/sync` requests to take significantly longer. This would particularly affect "initial" syncs for users participating in a large number of rooms, and in extreme cases, could make it impossible for such users to log in on a new client.
@@ -12,6 +12,17 @@ Bugfixes
 
 - Fix a performance regression in `/sync` handling, introduced in 1.49.0. ([\#11583](https://github.com/matrix-org/synapse/issues/11583))
 
+Internal Changes
+----------------
+
+- Work around a build problem on Debian Buster. ([\#11625](https://github.com/matrix-org/synapse/issues/11625))
+
+
+Synapse 1.49.1 (2021-12-21)
+===========================
+
+Not released due to problems building the debian packages.
+
 
 Synapse 1.49.0 (2021-12-14)
 ===========================
diff --git a/changelog.d/11625.misc b/changelog.d/11625.misc
deleted file mode 100644
index 82ee78e72..000000000
--- a/changelog.d/11625.misc
+++ /dev/null
@@ -1 +0,0 @@
-Work around a build problem on Debian Buster.
diff --git a/debian/changelog b/debian/changelog
index 61a1d003b..ebe3e0cbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.49.2) stable; urgency=medium
+
+  * New synapse release 1.49.2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 21 Dec 2021 17:31:03 +0000
+
 matrix-synapse-py3 (1.49.1) stable; urgency=medium
 
   * New synapse release 1.49.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d45e0f188..95a49c20b 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.49.1"
+__version__ = "1.49.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