[vidalia-svn] r2693: Updated torbutton version, fixed url location, updated OSX v (in vidalia/trunk/pkg: osx win32)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2008-06-11 19:50:01 -0400 (Wed, 11 Jun 2008)
New Revision: 2693

Modified:
   vidalia/trunk/pkg/osx/TorPostFlight
   vidalia/trunk/pkg/osx/buildmpkg.sh.in
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
Log:
Updated torbutton version, fixed url location, updated OSX version


Modified: vidalia/trunk/pkg/osx/TorPostFlight
===================================================================
--- vidalia/trunk/pkg/osx/TorPostFlight	2008-06-11 22:24:04 UTC (rev 2692)
+++ vidalia/trunk/pkg/osx/TorPostFlight	2008-06-11 23:50:01 UTC (rev 2693)
@@ -7,7 +7,7 @@
 TARGET=$2/Library/Tor
 TORDIR=$TARGET/var/lib/tor
 LOGFILE=/var/log/tor.log
-TORBUTTON_VERSION="1.2.0rc1"
+TORBUTTON_VERSION="1.2.0rc2"
 
 # 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-06-11 22:24:04 UTC (rev 2692)
+++ vidalia/trunk/pkg/osx/buildmpkg.sh.in	2008-06-11 23:50:01 UTC (rev 2693)
@@ -12,7 +12,7 @@
 #                *     *     *    *    *    * 
 #
 #  This file is derived from contrib/osx/package.sh from Tor 
-#  (http://tor.eff.org), licensed as follows:
+#  (https://www.torproject.org), licensed as follows:
 #   
 #  Copyright (c) 2001-2004, Roger Dingledine
 #  Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
@@ -103,7 +103,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.0rc1.xpi
+TORBUTTON_PATH=~/tmp/torbutton-1.2.0rc2.xpi
 TORBUTTON_LIC_PATH=~/tmp/LICENSE
 
 umask 022

Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-06-11 22:24:04 UTC (rev 2692)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-06-11 23:50:01 UTC (rev 2693)
@@ -33,7 +33,7 @@
 !define PRIVOXY_DESC        "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}"
 
 !define TORBUTTON_NAME      "Torbutton"
-!define TORBUTTON_APPVERSION "1.1.17-alpha"
+!define TORBUTTON_APPVERSION "1.2.0rc2"
 !define TORBUTTON_DESC      "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
 
 !define BUNDLE_NAME         "Vidalia Bundle"