From 40bd1c245f527fd8bb896be92e1e78fdd4155b5f Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 5 Jan 2015 10:25:49 -0800
Subject: [PATCH 1/3] Put version number in beta channel artifacts

---
 mk/main.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mk/main.mk b/mk/main.mk
index 0d9419cccfa83..278c2e01060ad 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -29,14 +29,14 @@ endif
 ifeq ($(CFG_RELEASE_CHANNEL),beta)
 # The beta channel is temporarily called 'alpha'
 CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
-# When building beta/nightly distributables just reuse the same "beta"
-# name so when we upload we'll always override the previous
-# nighly. This doesn't actually impact the version reported by rustc -
-# it's just for file naming.
-CFG_PACKAGE_VERS=alpha
+CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),nightly)
 CFG_RELEASE=$(CFG_RELEASE_NUM)-nightly
+# When building nightlydistributables just reuse the same "beta" name
+# so when we upload we'll always override the previous nighly. This
+# doesn't actually impact the version reported by rustc - it's just
+# for file naming.
 CFG_PACKAGE_VERS=nightly
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),dev)

From edbb7c3ed10c1f2482ff4b2860f3b14e6f73cb7b Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 5 Jan 2015 10:26:10 -0800
Subject: [PATCH 2/3] 0.13.0 -> 1.0.0

---
 mk/main.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/main.mk b/mk/main.mk
index 278c2e01060ad..113737c1525c5 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -13,7 +13,7 @@
 ######################################################################
 
 # The version number
-CFG_RELEASE_NUM=0.13.0
+CFG_RELEASE_NUM=1.0.0
 
 # An optional number to put after the label, e.g. '2' -> '-beta2'
 CFG_BETA_CYCLE=

From c548b879ef361736c53a615edd93e51a8c845a55 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 5 Jan 2015 10:28:18 -0800
Subject: [PATCH 3/3] Typo

---
 mk/main.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/main.mk b/mk/main.mk
index 113737c1525c5..a97e68af59b38 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -33,7 +33,7 @@ CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),nightly)
 CFG_RELEASE=$(CFG_RELEASE_NUM)-nightly
-# When building nightlydistributables just reuse the same "beta" name
+# When building nightly distributables just reuse the same "nightly" name
 # so when we upload we'll always override the previous nighly. This
 # doesn't actually impact the version reported by rustc - it's just
 # for file naming.