[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] [torbrowser/master] update all Makefiles and READMEs with new Firefox version in preparation for new TBB releases



Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date: Thu, 28 Oct 2010 11:52:49 -0700
Subject: update all Makefiles and READMEs with new Firefox version in preparation
Commit: ded96dfbad4cc3224a577107458064abac0139ff

---
 README                       |    9 ++++++---
 README.Linux                 |    5 ++++-
 README.OSX                   |    6 +++++-
 build-scripts/Makefile       |    6 +++---
 build-scripts/Makefile.linux |    4 ++--
 build-scripts/Makefile.osx   |    4 ++--
 6 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/README b/README
index f7ae729..a4b5d72 100644
--- a/README
+++ b/README
@@ -7,8 +7,8 @@ Included applications
 Vidalia 0.2.10 (with Qt 4.6.2)
 Tor 0.2.1.26 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8l) 
 Polipo 1.0.4.1
-FirefoxPortable 3.6.11
- \_ Firefox 3.6.11
+FirefoxPortable 3.6.12
+ \_ Firefox 3.6.12
     \_ Torbutton 1.2.5
     \_ HTTPS Everywhere 0.2.2
     \_ NoScript 2.0.3.2
@@ -288,6 +288,9 @@ Changelog
     NoScript 2.0.3.2
     HTTPS Everywhere 0.2.2
 
-1.3.11: Release 2010-10-25
+1.3.11: Released 2010-10-25
   update Firefox to 3.6.11
   update Pidgin to 2.7.4
+
+1.3.12: Released 2010-10-28
+  update Firefox to 3.6.12
diff --git a/README.Linux b/README.Linux
index aec5373..4655ffe 100644
--- a/README.Linux
+++ b/README.Linux
@@ -7,7 +7,7 @@ Included applications
 Vidalia 0.2.10 (with Qt 4.6.2)
 Tor 0.2.2.17-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8l) 
 Polipo 1.0.4.1
-Firefox 3.6.11
+Firefox 3.6.12
  \_ Torbutton 1.2.5
  |_ NoScript 2.0.2.3
  |_ BetterPrivacy 1.48.3
@@ -30,6 +30,9 @@ To exit, close Firefox. Vidalia will automatically clean up and exit.
 Changelog
 ---------
 
+1.0.15: Released 2010-10-28
+        Update Firefox to 3.6.12
+
 1.0.14: Released 2010-10-24
         Update Firefox to 3.6.11
 
diff --git a/README.OSX b/README.OSX
index 41e46cc..7ca2f5a 100644
--- a/README.OSX
+++ b/README.OSX
@@ -7,7 +7,7 @@ Included applications
 Vidalia 0.2.10 (with Qt 4.6.2)
 Tor 0.2.2.17-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8l) 
 Polipo 1.0.4.1
-Firefox (Namoroka) 3.6.11
+Firefox (Namoroka) 3.6.12
  \_ Torbutton 1.2.5
  |_ NoScript 2.0.2.3
  |_ HTTPS-Everywhere 0.2.2
@@ -24,6 +24,10 @@ To exit, close Firefox and Vidalia.
 Changelog
 ---------
 
+1.0.4: Released 2010-10-28
+       Update Firefox to 3.6.12
+       Fix weird Torbutton location so users can tell it's installed
+
 1.0.3: Released 2010-10-25
        Update Firefox to 3.6.11
 
diff --git a/build-scripts/Makefile b/build-scripts/Makefile
index 8d35cad..b4e2847 100644
--- a/build-scripts/Makefile
+++ b/build-scripts/Makefile
@@ -18,14 +18,14 @@ OPENSSL=/c/OpenSSL/bin
 
 ## Versions
 TORBUTTON_VERSION=1.2.5
-FIREFOX_VERSION=3.6.11
+FIREFOX_VERSION=3.6.12
 PIDGIN_VERSION=2.7.4
 
 ## Location of bundle components
 VIDALIA=/c/build/vidalia-0.2.10
 TOR=/c/build/tor-0.2.1.26
 POLIPO=/c/build/polipo-1.0.4.1
-FIREFOX_SRC=/c/build/FirefoxPortable-3.6.11
+FIREFOX_SRC=/c/build/FirefoxPortable-3.6.12
 PIDGIN_SRC=/c/build/PidginPortable-2.7.4
 
 ## Location of utility applications
@@ -49,7 +49,7 @@ DEST="Generic Bundle"
 NAME="Tor Browser"
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.3.11
+VERSION=1.3.12
 DEFAULT_COMPRESSED_BASENAME=tor-browser-
 IM_COMPRESSED_BASENAME=tor-im-browser-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
diff --git a/build-scripts/Makefile.linux b/build-scripts/Makefile.linux
index ce87e77..51e8fad 100644
--- a/build-scripts/Makefile.linux
+++ b/build-scripts/Makefile.linux
@@ -42,7 +42,7 @@ TBB_FINAL=$(BUILT_DIR)/TBBL
 
 ## Versions for our source packages
 HTTPSEVERY_VER=0.2.2
-FIREFOX_VER=3.6.11
+FIREFOX_VER=3.6.12
 LIBEVENT_VER=1.4.13-stable
 LIBPNG_VER=1.4.3
 NOSCRIPT_VER=2.0.2.3
@@ -216,7 +216,7 @@ NAME=tor-browser
 DISTDIR=tbbl-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.0.14-dev
+VERSION=1.0.15-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)
diff --git a/build-scripts/Makefile.osx b/build-scripts/Makefile.osx
index 3e4d733..a3b111a 100644
--- a/build-scripts/Makefile.osx
+++ b/build-scripts/Makefile.osx
@@ -42,7 +42,7 @@ TBB_FINAL=$(BUILT_DIR)/TBBL
 
 ## Versions for our source packages
 HTTPSEVERY_VER=0.2.2
-FIREFOX_VER=3.6.11
+FIREFOX_VER=3.6.12
 LIBEVENT_VER=1.4.13-stable
 LIBPNG_VER=1.4.3
 NOSCRIPT_VER=2.0.2.3
@@ -210,7 +210,7 @@ NAME=TorBrowser
 DISTDIR=tbbosx-dist
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.0.3-dev
+VERSION=1.0.4-dev
 DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-
 IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)$(ARCH_TYPE)
-- 
1.7.1