[or-cvs] [torbrowser/master 2/2] bump to 0.2.2.19-alpha and 1.0.17-dev

[erinn at torproject.org]

Author: Erinn Clark <erinn at torproject.org>
Date: Tue, 23 Nov 2010 12:31:05 -0800
Subject: bump to 0.2.2.19-alpha and 1.0.17-dev
Commit: ea0145c7a9e03454cbec4522870f76f5117054a9

---
 README.Linux                 |    5 ++++-
 build-scripts/Makefile.linux |    7 +++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.Linux b/README.Linux
index 5cfde5c..37c98bc 100644
--- a/README.Linux
+++ b/README.Linux
@@ -5,7 +5,7 @@ Included applications
 ---------------------
 
 Vidalia 0.2.10 (with Qt 4.6.2)
-Tor 0.2.2.18-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) 
+Tor 0.2.2.19-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) 
 Polipo 1.0.4.1
 Firefox 3.6.12
  \_ Torbutton 1.2.5
@@ -30,6 +30,9 @@ To exit, close Firefox. Vidalia will automatically clean up and exit.
 Changelog
 ---------
 
+1.0.17: Released 2010-11-24
+        Update Tor to 0.2.2.19-alpha
+
 1.0.16: Released 2010-11-16
         Update Tor to 0.2.2.18-alpha
         Update OpenSSL to 0.9.8p (see CVE-2010-3864)
diff --git a/build-scripts/Makefile.linux b/build-scripts/Makefile.linux
index 8619043..6ce1801 100644
--- a/build-scripts/Makefile.linux
+++ b/build-scripts/Makefile.linux
@@ -35,7 +35,7 @@
 ARCH_TYPE=$(shell uname -m)
 
 ## Location of directory for source unpacking
-FETCH_DIR=/home/e/build
+FETCH_DIR=/build
 ## Location of directory for prefix/destdir/compiles/etc
 BUILT_DIR=$(FETCH_DIR)/built
 TBB_FINAL=$(BUILT_DIR)/TBBL
@@ -51,7 +51,7 @@ OTR_VER=3.2.0
 PIDGIN_VER=2.6.4
 POLIPO_VER=1.0.4.1
 QT_VER=4.6.2
-TOR_VER=0.2.2.18-alpha
+TOR_VER=0.2.2.19-alpha
 TORBUTTON_VER=1.2.5
 VIDALIA_VER=0.2.10
 ZLIB_VER=1.2.3
@@ -103,7 +103,6 @@ unpack-source:
 	cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE)
 	cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE)
 	cd $(FETCH_DIR) && tar -xvzf $(POLIPO_PACKAGE)
-	cd $(FETCH_DIR) && tar -xvjf $(PIDGIN_PACKAGE)
 	cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE)
 
 source-dance: fetch-source unpack-source
@@ -216,7 +215,7 @@ NAME=tor-browser
 DISTDIR=tbbl-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.0.16-dev
+VERSION=1.0.17-dev
 DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)-
 IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
-- 
1.7.1