[tor-commits] [torbrowser/master] bump alpha tbbs to 2.3.12-alpha-2
erinn at torproject.org
erinn at torproject.org
Mon Mar 19 04:31:06 UTC 2012
commit 84b1758c054203b59e6ed9f54a95aa5b3463a222
Author: Erinn Clark <erinn at torproject.org>
Date: Mon Mar 19 01:28:44 2012 -0300
bump alpha tbbs to 2.3.12-alpha-2
---
README.LINUX-2.3 | 6 +++---
README.OSX-2.3 | 6 +++---
README.WIN-2.3 | 6 +++---
build-scripts/linux-alpha.mk | 2 +-
build-scripts/osx-alpha.mk | 2 +-
build-scripts/versions-alpha.mk | 4 ++--
build-scripts/windows-alpha.mk | 2 +-
changelog.linux-2.3 | 14 +++++++++++++-
changelog.osx-2.3 | 11 +++++++++++
changelog.windows-2.3 | 13 ++++++++++++-
10 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/README.LINUX-2.3 b/README.LINUX-2.3
index 760e6c8..8362384 100644
--- a/README.LINUX-2.3
+++ b/README.LINUX-2.3
@@ -6,10 +6,10 @@ Included applications
Vidalia 0.3.1-alpha (with Qt 4.7.4)
Tor 0.2.3.12-alpha (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.1-beta1)
-Firefox 10.0.1
+Firefox 11.0
\_ Torbutton 1.4.5.1
- |_ NoScript 2.3
- |_ HTTPS-Everywhere 2.0development.4
+ |_ NoScript 2.3.4
+ |_ HTTPS-Everywhere 3.0development.1
Usage
-----
diff --git a/README.OSX-2.3 b/README.OSX-2.3
index 3f54336..aeef423 100644
--- a/README.OSX-2.3
+++ b/README.OSX-2.3
@@ -6,10 +6,10 @@ Included applications
Vidalia 0.3.1-alpha (with Qt 4.7.4)
Tor 0.2.3.12-alpha (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.1-beta1)
-Firefox 10.0.1
+Firefox 11.0
\_ Torbutton 1.4.5.1
- |_ NoScript 2.3
- |_ HTTPS-Everywhere 2.0development.4
+ |_ NoScript 2.3.4
+ |_ HTTPS-Everywhere 3.0development.1
Usage
-----
diff --git a/README.WIN-2.3 b/README.WIN-2.3
index 90c8c83..d5f1963 100644
--- a/README.WIN-2.3
+++ b/README.WIN-2.3
@@ -6,10 +6,10 @@ Included applications
Vidalia 0.3.1-alpha (with Qt 4.7.4)
Tor 0.2.3.12-alpha (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.1-beta1)
-Firefox 10.0.1
+Firefox 11.0
\_ Torbutton 1.4.5.1
- |_ NoScript 2.3
- |_ HTTPS-Everywhere 2.0development.4
+ |_ NoScript 2.3.4
+ |_ HTTPS-Everywhere 3.0development.1
Usage
-----
diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk
index 04c1608..d78c977 100644
--- a/build-scripts/linux-alpha.mk
+++ b/build-scripts/linux-alpha.mk
@@ -36,7 +36,7 @@ include $(PWD)/versions-alpha.mk
## Architecture
ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=1
+BUILD_NUM=2
PLATFORM=Linux
## Location of directory for source unpacking
diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index 678c531..8cf79e1 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -36,7 +36,7 @@ include $(PWD)/versions-alpha.mk
## Architecture
ARCH_TYPE=i386
-BUILD_NUM=1
+BUILD_NUM=2
PLATFORM=MacOS
## Location of directory for source unpacking
diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index a9397cf..dc9ac0f 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -2,11 +2,11 @@
RELEASE_VER=2.3.12-alpha
-HTTPSEVERY_VER=2.0development.4
+HTTPSEVERY_VER=3.0development.1
FIREFOX_VER=11.0
LIBEVENT_VER=2.0.17-stable
LIBPNG_VER=1.5.7
-NOSCRIPT_VER=2.3
+NOSCRIPT_VER=2.3.4
OPENSSL_VER=1.0.1-beta1
OTR_VER=3.2.0
PIDGIN_VER=2.6.4
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index fb5f6d9..8155392 100644
--- a/build-scripts/windows-alpha.mk
+++ b/build-scripts/windows-alpha.mk
@@ -31,7 +31,7 @@
## Include versions
include $(PWD)/versions-alpha.mk
-BUILD_NUM=1
+BUILD_NUM=2
PLATFORM=Windows
## Location of required libraries
diff --git a/changelog.linux-2.3 b/changelog.linux-2.3
index 8090ce7..62d8750 100644
--- a/changelog.linux-2.3
+++ b/changelog.linux-2.3
@@ -1,4 +1,16 @@
-Tor Browser Bundle (2.3.12-alpha-1); suite=osx
+Tor Browser Bundle (2.3.12-alpha-2); suite=linux
+
+ * Update Firefox to 11.0
+ * Update NoScript to 2.3.4
+ * Update HTTPS Everywhere to 3.0development.1
+ * Disable HTTPS Everywhere SSL Observatory screen (closes: #5300)
+ * Always build to with warnings enabled (closes: #4470)
+ * Don't attempt to load the default KDE 4 theme from Vidalia, because that
+ fails when the Qt versions don't match (closes: #5214)
+
+ -- Erinn Clark <erinn at torproject.org> Mon Mar 19 01:14:43 BRT 2012
+
+Tor Browser Bundle (2.3.12-alpha-1); suite=linux
* Initial release
diff --git a/changelog.osx-2.3 b/changelog.osx-2.3
index 8090ce7..f88a5e2 100644
--- a/changelog.osx-2.3
+++ b/changelog.osx-2.3
@@ -1,3 +1,14 @@
+Tor Browser Bundle (2.3.12-alpha-2); suite=osx
+
+ * Update Firefox to 11.0
+ * Update NoScript to 2.3.4
+ * Update HTTPS Everywhere to 3.0development.1
+ * Disable HTTPS Everywhere SSL Observatory screen (closes: #5300)
+ * Always build to with warnings enabled (closes: #4470)
+ * Give OS X users below 10.5 an incompatibility message (closes: #4356)
+
+ -- Erinn Clark <erinn at torproject.org> Mon Mar 19 01:14:43 BRT 2012
+
Tor Browser Bundle (2.3.12-alpha-1); suite=osx
* Initial release
diff --git a/changelog.windows-2.3 b/changelog.windows-2.3
index 8090ce7..6ee3cfc 100644
--- a/changelog.windows-2.3
+++ b/changelog.windows-2.3
@@ -1,4 +1,15 @@
-Tor Browser Bundle (2.3.12-alpha-1); suite=osx
+Tor Browser Bundle (2.3.12-alpha-2); suite=windows
+
+ * Update Firefox to 11.0
+ * Update NoScript to 2.3.4
+ * Update HTTPS Everywhere to 3.0development.1
+ * Disable HTTPS Everywhere SSL Observatory screen (closes: #5300)
+ * Always build to with warnings enabled (closes: #4470)
+ * Remove tor-resolve from the Windows bundle (closes: #5403)
+
+ -- Erinn Clark <erinn at torproject.org> Mon Mar 19 01:14:43 BRT 2012
+
+Tor Browser Bundle (2.3.12-alpha-1); suite=windows
* Initial release
More information about the tor-commits
mailing list