[tor-commits] [torbrowser/maint-2.2] bump tbb linux to 1.1.5-dev for firefox 3.6.15

[erinn at torproject.org]

commit aa690bbce0ecb364c9b523957a9b5ed3eb19d819
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Mar 5 20:00:48 2011 +0100

    bump tbb linux to 1.1.5-dev for firefox 3.6.15
---
 README.Linux           |   11 ++++++++---
 build-scripts/linux.mk |    8 ++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.Linux b/README.Linux
index 99d9773..3fca65d 100644
--- a/README.Linux
+++ b/README.Linux
@@ -6,11 +6,11 @@ Included applications
 
 Vidalia 0.2.10 (with Qt 4.6.2)
 Tor 0.2.2.22-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) 
-Firefox 3.6.13
+Firefox 3.6.15
  \_ Torbutton 1.2.5
- |_ NoScript 2.0.9.3
+ |_ NoScript 2.0.9.8
  |_ BetterPrivacy 1.48.3
- |_ HTTPS Everywhere 0.9.9.development.2
+ |_ HTTPS Everywhere 0.9.9.development.3
 
 Usage
 -----
@@ -29,6 +29,11 @@ To exit, close Firefox. Vidalia will automatically clean up and exit.
 Changelog
 ---------
 
+1.1.5:  Released 2011-03-07
+        Update Firefox to 3.6.15
+        Update NoScript to 2.0.9.8
+        Update HTTPS-Everywhere to 0.9.9.development.3
+
 1.1.4:  Released 2011-01-26
         Update Tor to 0.2.2.22-alpha
         Remove useless polipo and privoxy check from shell script
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index fe2a788..4400fe5 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -41,11 +41,11 @@ BUILT_DIR=$(FETCH_DIR)/built
 TBB_FINAL=$(BUILT_DIR)/TBBL
 
 ## Versions for our source packages
-HTTPSEVERY_VER=0.9.9.development.2
-FIREFOX_VER=3.6.13
+HTTPSEVERY_VER=0.9.9.development.3
+FIREFOX_VER=3.6.15
 LIBEVENT_VER=1.4.13-stable
 LIBPNG_VER=1.4.3
-NOSCRIPT_VER=2.0.9.3
+NOSCRIPT_VER=2.0.9.8
 OPENSSL_VER=0.9.8p
 OTR_VER=3.2.0
 PIDGIN_VER=2.6.4
@@ -216,7 +216,7 @@ NAME=tor-browser
 DISTDIR=tbbl-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.1.4-dev
+VERSION=1.1.5-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)