Merge branch 'master' into develop

1 files changed, 4 insertions, 4 deletions

diff --git a/setup.py b/setup.py

index ed21799e72..d0d649612d 100755
--- a/setup.py
+++ b/setup.py
@@ -26,13 +26,13 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 setup(
-    name="synapse",
-    version=read("VERSION"),
+    name="matrix-synapse",
+    version=read("VERSION").strip(),
     packages=find_packages(exclude=["tests", "tests.*"]),
     description="Reference Synapse Home Server",
     install_requires=[
         "syutil==0.0.2",
-        "syweb==0.0.1",
+        "matrix_angular_sdk==0.5.0",
         "Twisted>=14.0.0",
         "service_identity>=1.0.0",
         "pyopenssl>=0.14",
@@ -45,7 +45,7 @@ setup(
     dependency_links=[
         "https://github.com/matrix-org/syutil/tarball/v0.0.2#egg=syutil-0.0.2",
         "https://github.com/pyca/pynacl/tarball/52dbe2dc33f1#egg=pynacl-0.3.0",
-        "https://github.com/matrix-org/matrix-angular-sdk/tarball/master/#egg=syweb-0.0.1",
+        "https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.5.0/#egg=matrix_angular_sdk-0.5.0",
     ],
     setup_requires=[
         "setuptools_trial",