[vidalia-svn] r3059: Backport r3057. (vidalia/branches/vidalia-0.1/pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-09-11 21:45:48 -0400 (Thu, 11 Sep 2008)
New Revision: 3059

Modified:
   vidalia/branches/vidalia-0.1/pkg/win32/vidalia-bundle.nsi.in
Log:
Backport r3057.


Modified: vidalia/branches/vidalia-0.1/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/branches/vidalia-0.1/pkg/win32/vidalia-bundle.nsi.in	2008-09-10 02:17:00 UTC (rev 3058)
+++ vidalia/branches/vidalia-0.1/pkg/win32/vidalia-bundle.nsi.in	2008-09-12 01:45:48 UTC (rev 3059)
@@ -335,7 +335,9 @@
         SectionIn 1 2
         ; add files / whatever that need to be installed here.
         SetOutPath "$INSTDIR\Privoxy"
-        File /r @PRIVOXY_PACKAGE_DIR@\*.*
+        File /r /x @PRIVOXY_PACKAGE_DIR@\config.txt @PRIVOXY_PACKAGE_DIR@\*.*
+        File /nonfatal /oname=config.original @PRIVOXY_PACKAGE_DIR@\config.txt
+        File /oname=config.txt @Vidalia_SOURCE_DIR@\pkg\win32\privoxy.config
 
         WriteRegStr HKEY_CLASSES_ROOT "PrivoxyActionFile\shell\open\command" "" 'Notepad.exe "%1"'
         WriteRegStr HKEY_CLASSES_ROOT ".action" "" "PrivoxyActionFile"