[tor-commits] [torbrowser/master] bump tbb ff4 linux version to 2.2.29, bump extension and libevent version

[erinn at torproject.org]

commit 06df009e6a9dbf6be39dd131f5d071903b18acd6
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Jun 21 18:14:34 2011 -0300

    bump tbb ff4 linux version to 2.2.29, bump extension and libevent version
---
 README.LINUX-2.2       |    8 ++++----
 build-scripts/linux.mk |    2 +-
 changelog.linux-2.2    |   10 ++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index df7160e..8455d06 100644
--- a/README.LINUX-2.2
+++ b/README.LINUX-2.2
@@ -5,12 +5,12 @@ Included applications
 ---------------------
 
 Vidalia 0.2.12 (with Qt 4.6.2)
-Tor 0.2.2.27-beta (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d)
+Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d)
 Firefox (Tumucumaque) 4.0.1
  \_ Torbutton 1.3.3-alpha
- |_ NoScript 2.1.0.5
- |_ HTTPS-Everywhere 0.9.9.development.5
- |_ BetterPrivacy 1.50
+ |_ NoScript 2.1.1.1
+ |_ HTTPS-Everywhere 0.9.9.development.6
+ |_ BetterPrivacy 1.51
 
 Usage
 -----
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index ed792b1..aaeb11d 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -154,7 +154,7 @@ NAME=tor-browser
 DISTDIR=tbbl-alpha-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=2.2.27-1-alpha
+VERSION=$(RELEASE_VER)-1-alpha
 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)
diff --git a/changelog.linux-2.2 b/changelog.linux-2.2
index 9aa89c4..e87f008 100644
--- a/changelog.linux-2.2
+++ b/changelog.linux-2.2
@@ -1,3 +1,13 @@
+Tor Browser Bundle (2.2.29-1) alpha; suite=linux
+
+  * Update Tor to 0.2.2.29-beta
+  * Update Libevent to 2.0.12-stable
+  * Update HTTPS Everywhere to 0.9.9.development.6
+  * Update NoScript to 2.1.1.1
+  * Update BetterPrivacy to 1.51
+
+ -- Erinn Clark <erinn at torproject.org>  Tue Jun 21 18:06:27 ART 2011
+
 Tor Browser Bundle (2.2.27-1) alpha; suite=linux
 
   * Update Tor to 0.2.2.27-beta