[vidalia-svn] r2875: Updated to torbutton 1.2.0rc6 (in vidalia/trunk/pkg: osx win32)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2008-07-13 12:44:43 -0400 (Sun, 13 Jul 2008)
New Revision: 2875

Modified:
   vidalia/trunk/pkg/osx/TorPostFlight
   vidalia/trunk/pkg/osx/buildmpkg.sh.in
   vidalia/trunk/pkg/win32/build-bundle.txt
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
Log:
Updated to torbutton 1.2.0rc6


Modified: vidalia/trunk/pkg/osx/TorPostFlight
===================================================================
--- vidalia/trunk/pkg/osx/TorPostFlight	2008-07-13 09:53:25 UTC (rev 2874)
+++ vidalia/trunk/pkg/osx/TorPostFlight	2008-07-13 16:44:43 UTC (rev 2875)
@@ -7,7 +7,7 @@
 TARGET=$2/Library/Tor
 TORDIR=$TARGET/var/lib/tor
 LOGFILE=/var/log/tor.log
-TORBUTTON_VERSION="1.2.0rc5"
+TORBUTTON_VERSION="1.2.0rc6"
 
 # Check defaults for TARGET
 if [ "$TARGET" == "//Library/Tor" ]; then

Modified: vidalia/trunk/pkg/osx/buildmpkg.sh.in
===================================================================
--- vidalia/trunk/pkg/osx/buildmpkg.sh.in	2008-07-13 09:53:25 UTC (rev 2874)
+++ vidalia/trunk/pkg/osx/buildmpkg.sh.in	2008-07-13 16:44:43 UTC (rev 2875)
@@ -105,7 +105,7 @@
 PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
 # Where have we put the xpi and license for Torbutton? Edit this if your
 # torbutton and torbutton license live somewhere else.
-TORBUTTON_PATH=~/tmp/torbutton-1.2.0rc5.xpi
+TORBUTTON_PATH=~/tmp/torbutton-1.2.0rc6.xpi
 TORBUTTON_LIC_PATH=~/tmp/LICENSE
 
 umask 022

Modified: vidalia/trunk/pkg/win32/build-bundle.txt
===================================================================
--- vidalia/trunk/pkg/win32/build-bundle.txt	2008-07-13 09:53:25 UTC (rev 2874)
+++ vidalia/trunk/pkg/win32/build-bundle.txt	2008-07-13 16:44:43 UTC (rev 2875)
@@ -23,10 +23,10 @@
 
 4. Create directories for the appropriate versions of each component.
 
-        C:\bundle\privoxy\3.0.3\
-        C:\bundle\tor\0.1.1.20\
-        C:\bundle\vidalia\0.0.6\
-        C:\bundle\torbutton\1.0.4-fx+tb\
+        C:\bundle\privoxy\3.0.6\
+        C:\bundle\tor\0.2.0.29-rc\
+        C:\bundle\vidalia\0.1.6\
+        C:\bundle\torbutton\1.2.0rc6\
 
 5. Install Vidalia, Tor, and Privoxy to the directories you created for them
 in Step 4. Remember that you may need to grab the torrc.sample file from

Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-07-13 09:53:25 UTC (rev 2874)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-07-13 16:44:43 UTC (rev 2875)
@@ -33,7 +33,7 @@
 !define PRIVOXY_DESC        "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}"
 
 !define TORBUTTON_NAME      "Torbutton"
-!define TORBUTTON_APPVERSION "1.2.0rc5"
+!define TORBUTTON_APPVERSION "1.2.0rc6"
 !define TORBUTTON_DESC      "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
 
 !define BUNDLE_NAME         "Vidalia Bundle"