summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md17
-rw-r--r--changelog.d/13850.misc1
-rw-r--r--changelog.d/13857.misc1
-rw-r--r--changelog.d/13858.misc1
-rw-r--r--changelog.d/13866.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
7 files changed, 24 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md
index fb91bc5f20..e61b61995a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,20 @@
+Synapse 1.68.0rc2 (2022-09-23)
+==============================
+
+Bugfixes
+--------
+
+- Fix building from packaged sdist. Broke in v1.68.0rc1. ([\#13866](https://github.com/matrix-org/synapse/issues/13866))
+
+
+Internal Changes
+----------------
+
+- Fix the release script not publishing binary wheels. ([\#13850](https://github.com/matrix-org/synapse/issues/13850))
+- Lower minimum supported rustc version to 1.58.1. ([\#13857](https://github.com/matrix-org/synapse/issues/13857))
+- Lock Rust dependencies versions. ([\#13858](https://github.com/matrix-org/synapse/issues/13858))
+
+
 Synapse 1.68.0rc1 (2022-09-20)
 ==============================
 
diff --git a/changelog.d/13850.misc b/changelog.d/13850.misc
deleted file mode 100644
index a973118aaf..0000000000
--- a/changelog.d/13850.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix the release script not publishing binary wheels.
\ No newline at end of file
diff --git a/changelog.d/13857.misc b/changelog.d/13857.misc
deleted file mode 100644
index 9bff3e245b..0000000000
--- a/changelog.d/13857.misc
+++ /dev/null
@@ -1 +0,0 @@
-Lower minimum supported rustc version to 1.58.1.
diff --git a/changelog.d/13858.misc b/changelog.d/13858.misc
deleted file mode 100644
index a17cc2abb8..0000000000
--- a/changelog.d/13858.misc
+++ /dev/null
@@ -1 +0,0 @@
-Lock Rust dependencies versions.
diff --git a/changelog.d/13866.bugfix b/changelog.d/13866.bugfix
deleted file mode 100644
index 8630d3b22f..0000000000
--- a/changelog.d/13866.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix building from packaged sdist. Broke in v1.68.0rc1.
diff --git a/debian/changelog b/debian/changelog
index 6325ce2994..339d477319 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.68.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.68.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 23 Sep 2022 09:40:10 +0100
+
 matrix-synapse-py3 (1.68.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.68.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 815cf4751e..ff0c9d1dbc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,7 +57,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.68.0rc1"
+version = "1.68.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"