From a8069e9739fdef8c7200d0d33a38b85100398136 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Tue, 11 Jun 2024 15:22:21 +0200
Subject: [PATCH] 1.109.0rc2

---
 CHANGES.md               | 10 ++++++++++
 changelog.d/17275.bugfix |  1 -
 changelog.d/17292.bugfix |  1 -
 debian/changelog         |  6 ++++++
 pyproject.toml           |  2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/17275.bugfix
 delete mode 100644 changelog.d/17292.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 092dbdbf2d..3116e1b2a8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+# Synapse 1.109.0rc2 (2024-06-11)
+
+### Bugfixes
+
+- Fix bug where OTKs were not always included in `/sync` response when using workers. Introduced in v1.109.0rc1. ([\#17275](https://github.com/element-hq/synapse/issues/17275))
+- Fix bug where `/sync` could get stuck due to edge case in device lists handling. Introduced in v1.109.0rc1. ([\#17292](https://github.com/element-hq/synapse/issues/17292))
+
+
+
+
 # Synapse 1.109.0rc1 (2024-06-04)
 
 ### Features
diff --git a/changelog.d/17275.bugfix b/changelog.d/17275.bugfix
deleted file mode 100644
index 04e8ab5eff..0000000000
--- a/changelog.d/17275.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where OTKs were not always included in `/sync` response when using workers. Introduced v1.109.0rc1.
diff --git a/changelog.d/17292.bugfix b/changelog.d/17292.bugfix
deleted file mode 100644
index c067a98ce8..0000000000
--- a/changelog.d/17292.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where `/sync` could get stuck due to edge case in device lists handling. Introduced in v1.109.0rc1.
diff --git a/debian/changelog b/debian/changelog
index 927248bdab..ac2536749d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.109.0~rc2) stable; urgency=medium
+
+  * New synapse release 1.109.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 11 Jun 2024 13:20:17 +0000
+
 matrix-synapse-py3 (1.109.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.109.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 8cc99b8cba..f4f7f70603 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.109.0rc1"
+version = "1.109.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"