From 8f1db0369e4a615e800876c338a2be59347adbe9 Mon Sep 17 00:00:00 2001
From: Daniel Borkan <dborkan@dborkan-macbookpro2.roam.corp.google.com>
Date: Mon, 16 Nov 2015 11:33:11 -0500
Subject: [PATCH] Remove Google hangouts from dist build, change "alpha" to
 "beta" for FF

---
 Gruntfile.coffee                                | 10 ----------
 src/firefox/package.json                        |  4 ++--
 src/generic_core/dist_build/freedom-module.json |  4 ----
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 074c5b67c3..30d0746d89 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -309,11 +309,6 @@ gruntConfig = {
             'freedomjs-anonymized-metrics/anonmetrics.json'
             'freedomjs-anonymized-metrics/metric.js'
             'freedom-for-chrome/freedom-for-chrome.js'
-            'freedom-social-xmpp/social.google.json'
-            'freedom-social-xmpp/socialprovider.js'
-            'freedom-social-xmpp/vcardstore.js'
-            'freedom-social-xmpp/node-xmpp-browser.js'
-            'freedom-social-xmpp/google-auth.js'
             'freedom-social-github/social.github.json'
             'freedom-social-github/github-social-provider.js'
             'freedom-social-firebase/social.firebase-facebook.json'
@@ -360,11 +355,6 @@ gruntConfig = {
             'data/freedomjs-anonymized-metrics/anonmetrics.json'
             'data/freedomjs-anonymized-metrics/metric.js'
             'data/freedom-for-firefox/freedom-for-firefox.jsm'
-            'data/freedom-social-xmpp/social.google.json'
-            'data/freedom-social-xmpp/socialprovider.js'
-            'data/freedom-social-xmpp/vcardstore.js'
-            'data/freedom-social-xmpp/node-xmpp-browser.js'
-            'data/freedom-social-xmpp/google-auth.js'
             'data/freedom-social-github/social.github.json'
             'data/freedom-social-github/github-social-provider.js'
             'data/freedom-social-firebase/social.firebase-facebook.json'
diff --git a/src/firefox/package.json b/src/firefox/package.json
index 932cd85546..fd6299f108 100644
--- a/src/firefox/package.json
+++ b/src/firefox/package.json
@@ -1,7 +1,7 @@
 {
   "name": "uproxy-firefox",
-  "title": "uProxy Alpha",
-  "description": "This is the alpha version of uProxy.",
+  "title": "uProxy Beta",
+  "description": "This is the beta version of uProxy.",
   "author": "uProxy Team <info@uproxy.org>",
   "id": "jid1-uTe1Bgrsb76jSA",
   "license": "Apache 2.0",
diff --git a/src/generic_core/dist_build/freedom-module.json b/src/generic_core/dist_build/freedom-module.json
index 5d416f1e74..d282c48e1e 100644
--- a/src/generic_core/dist_build/freedom-module.json
+++ b/src/generic_core/dist_build/freedom-module.json
@@ -15,10 +15,6 @@
       "url": "../freedom-social-firebase/social.firebase-facebook.json",
       "api": "social2"
     },
-    "SOCIAL-Google": {
-      "url": "../freedom-social-xmpp/social.google.json",
-      "api": "social"
-    },
     "loggingcontroller": {
       "url": "../uproxy-lib/loggingprovider/freedom-module.json",
       "api": "loggingcontroller"