[or-cvs] [torbrowser/master] update tbb repo for windows 1.3.11 release

[erinn@xxxxxxxxxxxxxx]

Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date: Tue, 26 Oct 2010 00:51:37 -0700
Subject: update tbb repo for windows 1.3.11 release
Commit: f08281c47ce2359776aeb121caf726f8593934fd

---
 README                 |   12 ++++++++----
 build-scripts/Makefile |   18 +++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/README b/README
index b2f70dd..f7ae729 100644
--- a/README
+++ b/README
@@ -7,14 +7,14 @@ 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.10
- \_ Firefox 3.6.10
+FirefoxPortable 3.6.11
+ \_ Firefox 3.6.11
     \_ Torbutton 1.2.5
     \_ HTTPS Everywhere 0.2.2
     \_ NoScript 2.0.3.2
     \_ Better Privacy 1.48.3
-PidginPortable 2.7.2
- \_ Pidgin 2.7.2
+PidginPortable 2.7.4
+ \_ Pidgin 2.7.4
    \_ OTR 3.2
 
 Usage
@@ -287,3 +287,7 @@ Changelog
     Better Privacy 1.48.3
     NoScript 2.0.3.2
     HTTPS Everywhere 0.2.2
+
+1.3.11: Release 2010-10-25
+  update Firefox to 3.6.11
+  update Pidgin to 2.7.4
diff --git a/build-scripts/Makefile b/build-scripts/Makefile
index 3c2e20d..8d35cad 100644
--- a/build-scripts/Makefile
+++ b/build-scripts/Makefile
@@ -18,15 +18,15 @@ OPENSSL=/c/OpenSSL/bin
 
 ## Versions
 TORBUTTON_VERSION=1.2.5
-FIREFOX_VERSION=3.6.10
-PIDGIN_VERSION=2.7.3
+FIREFOX_VERSION=3.6.11
+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.10
-PIDGIN_SRC=/c/build/PidginPortable-2.7.3
+FIREFOX_SRC=/c/build/FirefoxPortable-3.6.11
+PIDGIN_SRC=/c/build/PidginPortable-2.7.4
 
 ## Location of utility applications
 PWD:=$(shell pwd)
@@ -49,7 +49,7 @@ DEST="Generic Bundle"
 NAME="Tor Browser"
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.3.10
+VERSION=1.3.11
 DEFAULT_COMPRESSED_BASENAME=tor-browser-
 IM_COMPRESSED_BASENAME=tor-im-browser-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
@@ -339,8 +339,8 @@ SRCDEST=/tmp
 SRCDESTPATH=$(SRCDEST)/$(SRCNAME)
 srcdist:
 	rm -fr $(SRCDESTPATH)
-	svn export https://svn.torproject.org/svn/torbrowser/trunk/ \
-                   $(SRCDESTPATH)
+	git clone git://git.torproject.org/torbrowser.git \
+		$(SRCDESTPATH)
 	cd $(SRCDEST); tar --exclude src/archived-patches \
-                           --exclude src/current-patches  --exclude src/processtest \
-                           -czvf $(SRCNAME)-src.tar.gz $(SRCNAME)
+		--exclude src/current-patches  --exclude src/processtest \
+		--exclude .git -czvf $(SRCNAME)-src.tar.gz $(SRCNAME)
-- 
1.7.1