From 350e84a8a4041821a6fb4e8f6cd42436862275ff Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <oliverw@matrix.org>
Date: Wed, 5 Mar 2025 14:35:21 +0000
Subject: [PATCH] 1.126.0rc2

---
 CHANGES.md             | 9 ++++++++-
 changelog.d/18212.misc | 1 -
 changelog.d/18213.misc | 1 -
 debian/changelog       | 6 ++++++
 pyproject.toml         | 2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/18212.misc
 delete mode 100644 changelog.d/18213.misc

diff --git a/CHANGES.md b/CHANGES.md
index 6643344125..40df704d68 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,16 @@
-# Synapse 1.126.0rc1 (2025-03-04)
+# Synapse 1.126.0rc2 (2025-03-05)
 
 Administrators using the Debian/Ubuntu packages from `packages.matrix.org`, please check
 [the relevant section in the upgrade notes](https://github.com/element-hq/synapse/blob/release-v1.126/docs/upgrade.md#change-of-signing-key-expiry-date-for-the-debianubuntu-package-repository)
 as we have recently updated the expiry date on the repository's GPG signing key. The old version of the key will expire on `2025-03-15`.
 
+### Internal Changes
+
+- Fix wheel building configuration in CI by installing libatomic1. ([\#18212](https://github.com/element-hq/synapse/issues/18212), [\#18213](https://github.com/element-hq/synapse/issues/18213))
+
+# Synapse 1.126.0rc1 (2025-03-04)
+
+Synapse 1.126.0rc1 was not fully released due to an error in CI.
 
 ### Features
 
diff --git a/changelog.d/18212.misc b/changelog.d/18212.misc
deleted file mode 100644
index 0e8516a323..0000000000
--- a/changelog.d/18212.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix wheel building configuration in CI by installing libatomic1.
\ No newline at end of file
diff --git a/changelog.d/18213.misc b/changelog.d/18213.misc
deleted file mode 100644
index 0e8516a323..0000000000
--- a/changelog.d/18213.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix wheel building configuration in CI by installing libatomic1.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index d7a3909224..b66326d79b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.126.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.126.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 05 Mar 2025 14:29:12 +0000
+
 matrix-synapse-py3 (1.126.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.126.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 80482f469a..f95c8e0e80 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,7 +97,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.126.0rc1"
+version = "1.126.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"
-- 
GitLab