[vidalia-svn] r3908: forward port r3907. (vidalia/trunk/pkg/win32)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2009-06-28 21:51:01 -0400 (Sun, 28 Jun 2009)
New Revision: 3908

Modified:
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
Log:
forward port r3907.


Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2009-06-29 01:50:27 UTC (rev 3907)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2009-06-29 01:51:01 UTC (rev 3908)
@@ -24,7 +24,7 @@
 
 !define TOR_NAME            "Tor"
 !define TOR_EXEC            "tor.exe"
-!define TOR_APPVERSION      "0.2.1.5"
+!define TOR_APPVERSION      "0.2.1.16-rc"
 !define TOR_DESC            "${TOR_NAME} ${TOR_APPVERSION}"
 
 !define PRIVOXY_NAME        "Privoxy"
@@ -33,7 +33,7 @@
 !define PRIVOXY_DESC        "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}"
 
 !define TORBUTTON_NAME      "Torbutton"
-!define TORBUTTON_APPVERSION "1.2.0"
+!define TORBUTTON_APPVERSION "1.2.1-fx"
 !define TORBUTTON_DESC      "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
 
 !define BUNDLE_NAME         "Vidalia Bundle"
@@ -147,6 +147,7 @@
 ;--------------------------------
 ; Vidalia
 Var configfile
+Var torgeoipfile
 var bInstallVidalia
 SectionGroup "${VIDALIA_DESC}" VidaliaGroup
     ;--------------------------------
@@ -177,6 +178,10 @@
       CreateDirectory "$APPDATA\Vidalia"
       SetOutPath "$APPDATA\Vidalia"
       File "@Vidalia_SOURCE_DIR@\pkg\geoip-cache"
+
+      ; Include tor's geoip file, too
+      StrCpy $torgeoipfile "geoip"
+      File /oname=$torgeoipfile "@TOR_PACKAGE_DIR@\geoip"
       
       ;If there's already a torrc config file, ask if they want to
       ;overwrite it with the new one.
@@ -255,6 +260,10 @@
        IntOp $0 $0 & ${SF_SELECTED}
        IntCmp $0 ${SF_SELECTED} skiptorrc
 
+       ; Include tor's geoip file, too
+       StrCpy $torgeoipfile "geoip"
+       File /oname=$torgeoipfile "@TOR_PACKAGE_DIR@\geoip"
+
        StrCpy $configfile "torrc"
        SetOutPath "$APPDATA\Tor"
 
@@ -319,6 +328,7 @@
           goto torrc_shortcut
         use_tor_torrc:
           StrCpy $configfile "$APPDATA\Tor\torrc"
+          StrCpy $torgeoipfile "$APPDATA\Tor\geoip"
         torrc_shortcut:
           SetShellVarContext all
           CreateShortCut  "${SHORTCUTS}\Tor\Torrc.lnk" "Notepad.exe" $configfile