merge of '1f42bc4bfde6612fcb7769fb57d50a224f6bef7e'

and 'ed8df353e5da4216524aa5bc5df052dffe6608dd'

history.txt

@@ -1,3 +1,9 @@
+2011-08-26 kytv
+  * Debian: Bugfix: Avoid overwriting preseeded debconf values
+    upon package installation (ticket #514).
+  * Windows: Fix bug in fixperms.bat that occurred when installing on
+    non-English versions of Windows 7 and Vista.
+
 2011-08-25 zzz
   * Blockfile:
     - Avoid NPE after corruption (ticket #515)

installer/resources/fix_logfile_path.cmd

@@ -29,5 +29,3 @@ cd /d %~dp0
 findstr /V /R "^wrapper.logfile=" wrapper.config > wrapper.new
 echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new
 move wrapper.new wrapper.config
-
-:: As an added bonus, wrapper.config now has DOS line endings in Windows.

installer/resources/fixperms.bat

@@ -8,4 +8,12 @@
 :: /q : quiet
 :: /t : recursive
 ::
-echo Y|icacls %1 /grant Users:F /c /t > %1%\fixperms.log
+:: Note: We should not use the group name "Users" since this group will not
+:: exist on non-English versions of Windows.
+::
+:: S-1-5-32-545 = Users (en). Benutzer (de), etc.
+::
+:: Specifying the SID will work on ALL versions of Windows.
+:: List of well-known SIDs at http://support.microsoft.com/kb/243330/en-us
+::
+echo Y|icacls %1 /grant  *S-1-5-32-545:F /c /t > %1%\fixperms.log