[tor-commits] [torbrowser/maint-2.4] bump Tor to 0.2.4.9-alpha and Firefox to 17.0.2esr

[erinn at torproject.org]

commit 30b322fd6deaafddcf64986bc402821041ef9250
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Jan 17 11:02:37 2013 +0100

    bump Tor to 0.2.4.9-alpha and Firefox to 17.0.2esr
---
 build-scripts/versions-alpha.mk |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index f7c887d..b266a64 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -8,14 +8,15 @@ LIBPNG_VER=1.5.13
 QT_VER=4.8.1
 VIDALIA_VER=0.2.21
 LIBEVENT_VER=2.0.21-stable
-TOR_VER=0.2.4.7-alpha
+TOR_VER=0.2.4.9-alpha
 PIDGIN_VER=2.6.4
-FIREFOX_VER=10.0.12esr
+FIREFOX_VER=17.0.2esr
 MOZBUILD_VER=1.5.1
 PYMAKE_VER=87d436cd8974
-TORBUTTON_VER=1.4.6.3
+TORBUTTON_VER=1.5.0pre-alpha
 NOSCRIPT_VER=2.6.4.2
 HTTPSEVERYWHERE_VER=4.0development.4
+PDFJS_VER=0.7.1
 OBFSPROXY_VER=0.1.4
 OTR_VER=3.2.0
 
@@ -203,9 +204,9 @@ $(TOR_DIR): $(FETCH_DIR)/$(TOR_PACKAGE) | $(BUILD_DIR)
 	cd $(FETCH_DIR) && tar -xmf $(TOR_PACKAGE) -C $(BUILD_DIR)/
 
 $(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/* | $(BUILD_DIR)
-	rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-esr10
+	rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-esr17
 	cd $(FETCH_DIR) && tar -xmf $(FIREFOX_PACKAGE) -C $(BUILD_DIR)/
-	mv $(BUILD_DIR)/mozilla-esr10 $(FIREFOX_DIR)
+	mv $(BUILD_DIR)/mozilla-esr17 $(FIREFOX_DIR)
 	cp ../src/current-patches/firefox/* $(FIREFOX_DIR)
 	cp patch-any-src.sh $(FIREFOX_DIR)
 	cd $(FIREFOX_DIR) && ./patch-any-src.sh