[tor-commits] [torbrowser/maint-2.2] bump all tbbs to 2.2.35-7 for new firefox (and new libpng for linux)

[erinn at torproject.org]

commit db5db0b30c2d5db84f07acc451963d043de8c523
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Feb 17 15:39:28 2012 +0100

    bump all tbbs to 2.2.35-7 for new firefox (and new libpng for linux)
---
 README.LINUX-2.2         |    2 +-
 README.OSX-2.2           |    2 +-
 README.WIN-2.2           |    2 +-
 build-scripts/linux.mk   |    2 +-
 build-scripts/osx.mk     |    2 +-
 build-scripts/windows.mk |    2 +-
 changelog.linux-2.2      |    7 +++++++
 changelog.osx-2.2        |    6 ++++++
 changelog.windows-2.2    |    6 ++++++
 9 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index 8c3bea9..9bcca0a 100644
--- a/README.LINUX-2.2
+++ b/README.LINUX-2.2
@@ -6,7 +6,7 @@ Included applications
 
 Vidalia 0.2.17 (with Qt 4.7.4)
 Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g)
-Firefox 10.0.1
+Firefox 10.0.2
  \_ Torbutton 1.4.5.1
  |_ NoScript 2.3
  |_ HTTPS-Everywhere 1.2.2
diff --git a/README.OSX-2.2 b/README.OSX-2.2
index de2d87a..5b97b50 100644
--- a/README.OSX-2.2
+++ b/README.OSX-2.2
@@ -6,7 +6,7 @@ Included applications
 
 Vidalia 0.2.17 (with Qt 4.7.4)
 Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g)
-Firefox 10.0.1
+Firefox 10.0.2
  \_ Torbutton 1.4.5.1
  |_ NoScript 2.3
  |_ HTTPS-Everywhere 1.2.2
diff --git a/README.WIN-2.2 b/README.WIN-2.2
index 9c406ec..d40fde9 100644
--- a/README.WIN-2.2
+++ b/README.WIN-2.2
@@ -6,7 +6,7 @@ Included applications
 
 Vidalia 0.2.17 (with Qt 4.7.4)
 Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0g)
-Firefox 10.0.1
+Firefox 10.0.2
  \_ Torbutton 1.4.5.1
  |_ NoScript 2.3
  |_ HTTPS-Everywhere 1.2.2
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 51bcc08..cd43ca4 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -36,7 +36,7 @@ include $(PWD)/versions.mk
 
 ## Architecture
 ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=6
+BUILD_NUM=7
 PLATFORM=Linux
 
 ## Location of directory for source unpacking
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 7cc57ce..c7bf9b3 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -36,7 +36,7 @@ include $(PWD)/versions.mk
 
 ## Architecture
 ARCH_TYPE=i386
-BUILD_NUM=6
+BUILD_NUM=7
 PLATFORM=MacOS
 
 ## Location of directory for source unpacking
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 2e390a9..7e7ebc0 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -31,7 +31,7 @@
 
 ## Include versions
 include $(PWD)/versions.mk
-BUILD_NUM=6
+BUILD_NUM=7
 PLATFORM=Windows
 
 ## Location of required libraries
diff --git a/changelog.linux-2.2 b/changelog.linux-2.2
index 287e20d..7fcfb4d 100644
--- a/changelog.linux-2.2
+++ b/changelog.linux-2.2
@@ -1,3 +1,10 @@
+Tor Browser Bundle (2.2.35-7); suite=linux
+
+  * Update Firefox to 10.0.2
+  * Update libpng to 1.5.8 (closes: #5144)
+
+ -- Erinn Clark <erinn at torproject.org>  Fri Feb 17 15:30:12 CET 2012
+
 Tor Browser Bundle (2.2.35-6); suite=linux
 
   * Update Firefox to 10.0.1
diff --git a/changelog.osx-2.2 b/changelog.osx-2.2
index 5f7a6a2..9148e79 100644
--- a/changelog.osx-2.2
+++ b/changelog.osx-2.2
@@ -1,3 +1,9 @@
+Tor Browser Bundle (2.2.35-7); suite=osx
+
+  * Update Firefox to 10.0.2
+
+ -- Erinn Clark <erinn at torproject.org>  Fri Feb 17 15:29:29 CET 2012
+
 Tor Browser Bundle (2.2.35-6); suite=osx
 
   * Update Firefox to 10.0.1
diff --git a/changelog.windows-2.2 b/changelog.windows-2.2
index 5c3e519..2285e1a 100644
--- a/changelog.windows-2.2
+++ b/changelog.windows-2.2
@@ -1,3 +1,9 @@
+Tor Browser Bundle (2.2.35-7); suite=windows
+
+  * Update Firefox to 10.0.2
+
+ -- Erinn Clark <erinn at torproject.org>  Fri Feb 17 15:30:09 CET 2012
+
 Tor Browser Bundle (2.2.35-6); suite=windows
 
   * Update Firefox to 10.0.1