commit 57cd4944d034a04a413c0394b8a11329e9d3d989 Author: Erinn Clark erinn@torproject.org Date: Wed Jul 13 09:59:37 2011 -0300
bump all firefox versions to 5.0.1 --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 4 ++-- changelog.osx-2.2 | 6 ++++++ changelog.win-2.2 | 6 ++++++ 9 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index ffb5a3a..c871c74 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,7 +6,7 @@ Included applications
Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0 +Firefox (Aurora) 5.0.1 _ Torbutton 1.4.0 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 73661e0..88564a6 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,7 +6,7 @@ Included applications
Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0 +Firefox (Aurora) 5.0.1 _ Torbutton 1.4.0 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 0c16957..dbe8ffb 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,8 +6,8 @@ Included applications
Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 5.0 - _ Firefox (Aurora) 5.0 +FirefoxPortable 5.0.1 + _ Firefox (Aurora) 5.0.1 _ Torbutton 1.4.0 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index e8303f1..1a59db4 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -35,7 +35,7 @@ include $(PWD)/versions.mk
## Architecture -ARCH_TYPE=x86_64 +ARCH_TYPE=i386
## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) @@ -149,7 +149,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist
## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-1-alpha +VERSION=$(RELEASE_VER)-2-alpha DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 4dc8589..af23c30 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.30
HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=5.0 +FIREFOX_VER=5.0.1 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.1.2 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 4100940..bf15a48 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -144,7 +144,7 @@ NAME="Tor Browser" DISTDIR=tbbwin-alpha-dist
## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-1-alpha +VERSION=$(RELEASE_VER)-2-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index ab000f5..f9119c5 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,12 +1,12 @@ Tor Browser Bundle (2.2.30-1) alpha; suite=linux
* Update Tor to 0.2.2.30-rc - * Update Firefox to 5.0 + * Update Firefox to 5.0.1 * Update Torbutton to 1.4.0 * Update HTTPS Everywhere to 1.0.0development.4 * Update NoScript to 2.1.1.2
- -- Erinn Clark erinn@torproject.org Tue Jul 12 19:26:17 ART 2011 + -- Erinn Clark erinn@torproject.org Wed Jul 13 09:07:41 ART 2011
Tor Browser Bundle (2.2.29-1) alpha; suite=linux
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index b5452de..888aaf5 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.30-2) alpha; suite=osx + + * Update Firefox to 5.0.1 + + - Erinn Clark erinn@torproject.org Wed Jul 13 09:07:41 ART 2011 + Tor Browser Bundle (2.2.30-1) alpha; suite=osx
* Update Tor to 0.2.2.30-rc diff --git a/changelog.win-2.2 b/changelog.win-2.2 index ba6ce71..ee916bc 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.30-2) alpha; suite=windows + + * Update Firefox to 5.0.1 + + - Erinn Clark erinn@torproject.org Wed Jul 13 09:07:41 ART 2011 + Tor Browser Bundle (2.2.30-1) alpha; suite=windows
* Update Tor to 0.2.2.30-rc