From f7bfa694aec6cb933b2b6e2ff971cda98dba3c6c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 13 Jul 2021 11:57:55 +0100
Subject: [PATCH] 1.38.0rc3

---
 CHANGES.md             | 9 +++++++++
 changelog.d/10247.misc | 1 -
 changelog.d/10379.misc | 1 -
 debian/changelog       | 8 ++++++--
 synapse/__init__.py    | 2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/10247.misc
 delete mode 100644 changelog.d/10379.misc

diff --git a/CHANGES.md b/CHANGES.md
index a1419d6495e1..dbdf0a1185e3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.38.0rc3 (2021-07-13)
+==============================
+
+Internal Changes
+----------------
+
+- Build the Debian packages in CI. ([\#10247](https://github.com/matrix-org/synapse/issues/10247), [\#10379](https://github.com/matrix-org/synapse/issues/10379))
+
+
 Synapse 1.38.0rc2 (2021-07-09)
 ==============================
 
diff --git a/changelog.d/10247.misc b/changelog.d/10247.misc
deleted file mode 100644
index 5824907bca63..000000000000
--- a/changelog.d/10247.misc
+++ /dev/null
@@ -1 +0,0 @@
-Build the Debian packages in CI.
diff --git a/changelog.d/10379.misc b/changelog.d/10379.misc
deleted file mode 100644
index 00bf178bb8fa..000000000000
--- a/changelog.d/10379.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add Github Actions workflow to attach release artifacts to release.
diff --git a/debian/changelog b/debian/changelog
index cafd03c6c159..efc84718a4bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-matrix-synapse-py3 (1.37.1ubuntu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.38.0rc3) prerelease; urgency=medium
 
+  [ Erik Johnston ]
   * Add synapse_review_recent_signups script
 
- -- Erik Johnston <erikj@matrix.org>  Thu, 01 Jul 2021 15:55:03 +0100
+  [ Synapse Packaging team ]
+  * New synapse release 1.38.0rc3.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 13 Jul 2021 11:53:56 +0100
 
 matrix-synapse-py3 (1.37.1) stable; urgency=medium
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 119afa9ebe38..bbd691fba2e1 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@
 except ImportError:
     pass
 
-__version__ = "1.38.0rc2"
+__version__ = "1.38.0rc3"
 
 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