Prepare 0.34 release

7 files changed, 18 insertions, 24 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 68210a7d60..a8744fb3d8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,21 +1,5 @@
-Synapse 0.34.0rc2 (2018-12-11)
-==============================
-
-Features
---------
-
-- Add a welcome page for the client API port. Credit to @krombel! ([\#4289](https://github.com/matrix-org/synapse/issues/4289))
-- Remove Matrix console from the default distribution ([\#4290](https://github.com/matrix-org/synapse/issues/4290))
-
-
-Internal Changes
-----------------
-
-- Disable pager when running git-show in CI ([\#4291](https://github.com/matrix-org/synapse/issues/4291))
-
-
-Synapse 0.34.0rc1 (2018-12-04)
-==============================
+Synapse 0.34.0 (2018-12-20)
+===========================
 
 Synapse 0.34 is the first release to fully support Python 3. We recommend
 upgrading to Python 3, but make sure to read the
@@ -24,6 +8,11 @@ upgrading to Python 3, but make sure to read the
 Features
 --------
 
+- Add 'sandbox' to CSP for media reprository ([\#4284](https://github.com/matrix-org/synapse/issues/4284))
+- Make the new landing page prettier. ([\#4294](https://github.com/matrix-org/synapse/issues/4294))
+- Fix deleting E2E room keys when using old SQLite versions. ([\#4295](https://github.com/matrix-org/synapse/issues/4295))
+- Add a welcome page for the client API port. Credit to @krombel! ([\#4289](https://github.com/matrix-org/synapse/issues/4289))
+- Remove Matrix console from the default distribution ([\#4290](https://github.com/matrix-org/synapse/issues/4290))
 - Add option to track MAU stats (but not limit people) ([\#3830](https://github.com/matrix-org/synapse/issues/3830))
 - Add an option to enable recording IPs for appservice users ([\#3831](https://github.com/matrix-org/synapse/issues/3831))
 - Rename login type m.login.cas to m.login.sso ([\#4220](https://github.com/matrix-org/synapse/issues/4220))
@@ -49,6 +38,8 @@ Bugfixes
 Internal Changes
 ----------------
 
+- Debian packages utilising a virtualenv with bundled dependencies can now be built. ([\#4212](https://github.com/matrix-org/synapse/issues/4212))
+- Disable pager when running git-show in CI ([\#4291](https://github.com/matrix-org/synapse/issues/4291))
 - A coveragerc file, as well as the py36-coverage tox target, have been added. ([\#4180](https://github.com/matrix-org/synapse/issues/4180))
 - Add a GitHub pull request template and add multiple issue templates ([\#4182](https://github.com/matrix-org/synapse/issues/4182))
 - Update README to reflect the fact that #1491 is fixed ([\#4188](https://github.com/matrix-org/synapse/issues/4188))
diff --git a/UPGRADE.rst b/UPGRADE.rst
index 95f4e33300..b431850863 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -68,7 +68,7 @@ Upgrading to v0.34.0
        synctl start
 
    Users who have installed from distribution packages should see the relevant
-   package documentation.
+   package documentation. See below for notes on Debian packages.
 
    * When upgrading to Python 3, you **must** make sure that your log files are
      configured as UTF-8, by adding ``encoding: utf8`` to the
@@ -107,6 +107,13 @@ Upgrading to v0.34.0
 
      There is no need to revert this change if downgrading to Python 2.
 
+   * We are also making available Debian packages which will run Synapse on
+     Python 3. You can switch to these packages with ``apt-get install
+     matrix-synapse-py3``, however, please read
+     [debian/NEWS](https://github.com/matrix-org/synapse/blob/release-v0.34.0/debian/NEWS)
+     before doing so. The existing ``matrix-synapse`` packages will continue to
+     use Python 2 for the time being.
+
 2. This release removes the ``riot.im`` from the default list of trusted
    identity servers.
 
diff --git a/changelog.d/4212.misc b/changelog.d/4212.misc
deleted file mode 100644
index 42f2546cf9..0000000000
--- a/changelog.d/4212.misc
+++ /dev/null
@@ -1 +0,0 @@
-Debian packages utilising a virtualenv with bundled dependencies can now be built.
diff --git a/changelog.d/4284.bugfix b/changelog.d/4284.bugfix
deleted file mode 100644
index 4a9478fa28..0000000000
--- a/changelog.d/4284.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add 'sandbox' to CSP for media reprository
diff --git a/changelog.d/4294.bugfix b/changelog.d/4294.bugfix
deleted file mode 100644
index 98114869fc..0000000000
--- a/changelog.d/4294.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Make the new landing page prettier.
diff --git a/changelog.d/4295.bugfix b/changelog.d/4295.bugfix
deleted file mode 100644
index e1603cbcda..0000000000
--- a/changelog.d/4295.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix deleting E2E room keys when using old SQLite versions.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d5f6dc2094..27241cb364 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.34.0rc2"
+__version__ = "0.34.0"