From 6b4fd8b43068c863b2861be997f8acb7568aff47 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 29 Jul 2022 12:23:13 +0100
Subject: [PATCH] 1.64.0rc2

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

diff --git a/CHANGES.md b/CHANGES.md
index da588454c..2f46c51ba 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.64.0rc2 (2022-07-29)
+==============================
+
+Internal Changes
+----------------
+
+- Warn instead of error when using `account_threepid_delegates.email`, which was deprecated in 1.64.0rc1. ([\#13406](https://github.com/matrix-org/synapse/issues/13406))
+
+
 Synapse 1.64.0rc1 (2022-07-26)
 ==============================
 
diff --git a/changelog.d/13406.misc b/changelog.d/13406.misc
deleted file mode 100644
index f78e052e8..000000000
--- a/changelog.d/13406.misc
+++ /dev/null
@@ -1 +0,0 @@
-Warn instead of error when using `account_threepid_delegates.email`, which was deprecated in 1.64.0rc1.
diff --git a/debian/changelog b/debian/changelog
index 38030a5e1..6a2dbdf32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.64.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.64.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 29 Jul 2022 12:22:53 +0100
+
 matrix-synapse-py3 (1.64.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.64.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index c70773759..4e8f7ae4f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ skip_gitignore = true
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.64.0rc1"
+version = "1.64.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"