commit 1929fd5db0802782066d52512d4c2a0fef144ed6 Author: Mike Perry mikeperry-git@torproject.org Date: Mon Mar 17 01:12:01 2014 -0700

Make it harder to mess up the Firefox langpack+version update. --- gitian/versions | 6 ++++-- gitian/versions.alpha | 6 ++++-- gitian/versions.beta | 6 ++++-- gitian/versions.nightly | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/gitian/versions b/gitian/versions index 8358f94..f007100 100755 --- a/gitian/versions +++ b/gitian/versions @@ -3,7 +3,9 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN"

VERIFY_TAGS=1

-TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1 +FIREFOX_VERSION=24.4.0esr + +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 @@ -22,7 +24,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5

OPENSSL_VER=1.0.1f GMP_VER=5.1.3 -FIREFOX_LANG_VER=24.4.0esr +FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 48e4464..5adee9a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,7 +4,9 @@ BUILD_PT_BUNDLES=1

VERIFY_TAGS=1

-TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1 +FIREFOX_VERSION=24.4.0esr + +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.5.2-alpha TORLAUNCHER_TAG=0.2.5.1a TORBUTTON_TAG=1.6.7.0 @@ -23,7 +25,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5

OPENSSL_VER=1.0.1f GMP_VER=5.1.3 -FIREFOX_LANG_VER=24.4.0esr +FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.beta b/gitian/versions.beta index 846ddfb..c4ad3fa 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -4,7 +4,9 @@ BUILD_PT_BUNDLES=1

VERIFY_TAGS=1

-TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1 +FIREFOX_VERSION=24.4.0esr + +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.1a TORBUTTON_TAG=1.6.7.0 @@ -23,7 +25,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5

OPENSSL_VER=1.0.1f GMP_VER=5.1.3 -FIREFOX_LANG_VER=24.4.0esr +FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 8ecbebb..57157c0 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -4,7 +4,9 @@ BUILD_PT_BUNDLES=1

VERIFY_TAGS=0

-TORBROWSER_TAG=tor-browser-24.4.0esr-1 +FIREFOX_VERSION=24.4.0esr + +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -23,7 +25,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5

OPENSSL_VER=1.0.1f GMP_VER=5.1.3 -FIREFOX_LANG_VER=24.4.0esr +FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5