[forward port] Update the list of documentation files in tor.nsi and package_nsis-weasel.sh

svn:r6380

2 files changed, 30 insertions, 17 deletions

diff --git a/contrib/package_nsis-weasel.sh b/contrib/package_nsis-weasel.sh
index 40bb1db266..97f900e81e 100755
--- a/contrib/package_nsis-weasel.sh
+++ b/contrib/package_nsis-weasel.sh
@@ -45,17 +45,24 @@ for fn in \
 	dir-spec.txt \
 	rend-spec.txt \
 	socks-extensions.txt \
-	stylesheet.css \
-	tor-spec.txt \
-	tor-doc-osx.html \
-	tor-doc-server.html \
-	tor-doc-unix.html \
-	tor-doc-win32.html \
-	tor-hidden-service.html \
-	tor-switchproxy.html \
 	version-spec.txt \
+	\
+	website/stylesheet.css \
+	website/tor-doc-osx.html.en \
+	website/tor-doc-osx.html.it \
+	website/tor-doc-server.html.en \
+	website/tor-doc-server.html.it \
+	website/tor-doc-unix.html.en \
+	website/tor-doc-unix.html.it \
+	website/tor-doc-win32.html.en \
+	website/tor-doc-win32.html.es \
+	website/tor-doc-win32.html.it \
+	website/tor-hidden-service.html.en \
+	website/tor-switchproxy.html.en \
+	website/tor-switchproxy.html.it \
+	 \
 	; do
-    clean_newlines doc/$fn win_tmp/doc/$fn
+    clean_newlines doc/"$fn" win_tmp/doc/"`basename $fn`"
 done
 
 cp doc/design-paper/tor-design.pdf win_tmp/doc/design-paper/tor-design.pdf
diff --git a/contrib/tor.nsi b/contrib/tor.nsi
index a5b58f2aef..8b83bd4d37 100644
--- a/contrib/tor.nsi
+++ b/contrib/tor.nsi
@@ -127,16 +127,22 @@ Section "Documents" Docs
    File "..\doc\dir-spec.txt"
    File "..\doc\rend-spec.txt"
    File "..\doc\socks-extensions.txt"
-   File "..\doc\stylesheet.css"
-   File "..\doc\tor-spec.txt"
-   File "..\doc\tor-doc-osx.html"
-   File "..\doc\tor-doc-server.html"
-   File "..\doc\tor-doc-unix.html"
-   File "..\doc\tor-doc-win32.html"
-   File "..\doc\tor-hidden-service.html"
-   File "..\doc\tor-switchproxy.html"
    File "..\doc\version-spec.txt"
    ;
+   File "..\doc\stylesheet.css"
+   File "..\doc\tor-doc-osx.html.en"
+   File "..\doc\tor-doc-osx.html.it"
+   File "..\doc\tor-doc-server.html.en"
+   File "..\doc\tor-doc-server.html.it"
+   File "..\doc\tor-doc-unix.html.en"
+   File "..\doc\tor-doc-unix.html.it"
+   File "..\doc\tor-doc-win32.html.en"
+   File "..\doc\tor-doc-win32.html.es"
+   File "..\doc\tor-doc-win32.html.it"
+   File "..\doc\tor-hidden-service.html.en"
+   File "..\doc\tor-switchproxy.html.en"
+   File "..\doc\tor-switchproxy.html.it"
+   ;
    File "..\doc\tor-resolve.html"
    File "..\doc\tor-reference.html"
    ;