From 664ba140807750137e2e383eceaa98471f47b575 Mon Sep 17 00:00:00 2001
From: "Olivier Wilkinson (reivilibre)" <oliverw@matrix.org>
Date: Tue, 4 Jul 2023 16:25:33 +0100
Subject: [PATCH] 1.87.0

---
 CHANGES.md               | 13 +++++++++++++
 changelog.d/15846.misc   |  1 -
 changelog.d/15862.bugfix |  3 ---
 debian/changelog         |  6 ++++++
 pyproject.toml           |  2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/15846.misc
 delete mode 100644 changelog.d/15862.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 2765045a1..134537f6e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,16 @@
+# Synapse 1.87.0 (2023-07-04)
+
+### Bugfixes
+
+- Pin `pydantic` to `^1.7.4` to avoid backwards-incompatible API changes from the 2.0.0 release.
+  Resolves https://github.com/matrix-org/synapse/issues/15858.
+  Contributed by @PaarthShah. ([\#15862](https://github.com/matrix-org/synapse/issues/15862))
+
+### Internal Changes
+
+- Split out 2022 changes from the changelog so the rendered version in GitHub doesn't timeout as much. ([\#15846](https://github.com/matrix-org/synapse/issues/15846))
+
+
 # Synapse 1.87.0rc1 (2023-06-27)
 
 Please note that this will be the last release of Synapse that is compatible with
diff --git a/changelog.d/15846.misc b/changelog.d/15846.misc
deleted file mode 100644
index f1c31d666..000000000
--- a/changelog.d/15846.misc
+++ /dev/null
@@ -1 +0,0 @@
-Split out 2022 changes from the changelog so the rendered version in GitHub doesn't timeout as much.
diff --git a/changelog.d/15862.bugfix b/changelog.d/15862.bugfix
deleted file mode 100644
index 8eb6aa9a7..000000000
--- a/changelog.d/15862.bugfix
+++ /dev/null
@@ -1,3 +0,0 @@
-Pin `pydantic` to ^=1.7.4 to avoid backwards-incompatible API changes from the 2.0.0 release.
-Resolves https://github.com/matrix-org/synapse/issues/15858.
-Contributed by @PaarthShah.
diff --git a/debian/changelog b/debian/changelog
index 2fa8d30fe..0d9216bee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.87.0) stable; urgency=medium
+
+  * New Synapse release 1.87.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 04 Jul 2023 16:24:00 +0100
+
 matrix-synapse-py3 (1.87.0~rc1) stable; urgency=medium
 
   * New synapse release 1.87.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 67ee3f173..192a07756 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -89,7 +89,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.87.0rc1"
+version = "1.87.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"