From f5d95f731496cbf17ef4b0362500a171b0a45000 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 4 Nov 2016 09:40:24 +0000
Subject: [PATCH 1/4] Use an env var for the package version

Because supplying arguments to npm scripts is a bad idea: it just
appends the arguments blindly to whatever the command was. Thanks,
npm.
---
 scripts/package.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/package.sh b/scripts/package.sh
index 64d555533c..d5deffef64 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-if [ $# -eq 1 ]; then
-    version=$1
+if [ -n "$DIST_VERSION" ]; then
+    version=$DIST_VERSION
 else
     version=`git describe --dirty --tags || echo unknown`
 fi

From d7d6b3b4a28b34b191fca8a669dbc8055801329a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 4 Nov 2016 10:12:21 +0000
Subject: [PATCH 2/4] Released matrix-js-sdk & matrix-react-sdk

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index aecf659645..bb252aad82 100644
--- a/package.json
+++ b/package.json
@@ -59,8 +59,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.6.4-rc.2",
-    "matrix-react-sdk": "0.7.5-rc.1",
+    "matrix-js-sdk": "0.6.4",
+    "matrix-react-sdk": "0.7.5",
     "modernizr": "^3.1.0",
     "q": "^1.4.1",
     "react": "^15.2.1",

From 11eb0a89ebc2ad6838fedb73085acf84e24884b6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 4 Nov 2016 10:13:23 +0000
Subject: [PATCH 3/4] Prepare changelog for v0.8.4

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be3d87d94e..12ebad994d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+hanges in [0.8.4](https://github.com/vector-im/vector-web/releases/tag/v0.8.4) (2016-11-04)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.8.4-rc.2...v0.8.4)
+
+ * No changes
+
 Changes in [0.8.4-rc.2](https://github.com/vector-im/vector-web/releases/tag/v0.8.4-rc.2) (2016-11-02)
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/vector-web/compare/v0.8.4-rc.1...v0.8.4-rc.2)

From 1c9a78a2f1f81b15d27ba993610e534328c6aa03 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 4 Nov 2016 10:13:23 +0000
Subject: [PATCH 4/4] v0.8.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bb252aad82..bfba63e021 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vector-web",
-  "version": "0.8.4-rc.2",
+  "version": "0.8.4",
   "description": "Vector webapp",
   "author": "matrix.org",
   "repository": {