Le mercredi 1 septembre 2010 13:09:01 Didier 'OdyX' Raboud, vous avez écrit : > (Note also that 0.6.19 only ships new translations, and is "pending"). Note that I just fixed the Windows 7 install yesterday, and I'd like to get 0.6.19 in Squeeze instead. Planned debdiff is attached. TIA, OdyX -- Didier Raboud, proud Debian Maintainer (DM). CH-1020 Renens didier@raboud.com
diff -Nru win32-loader-0.6.18/debian/changelog win32-loader-0.6.19/debian/changelog --- win32-loader-0.6.18/debian/changelog 2010-08-03 20:57:42.000000000 +0200 +++ win32-loader-0.6.19/debian/changelog 2010-09-01 23:35:53.000000000 +0200 @@ -1,3 +1,17 @@ +win32-loader (0.6.19) unstable; urgency=low + + [ Updated translations ] + - Asturian (Maacub) + - Spanish (Javier Fernández-Sanguino) + - Icelandic added (Sveinn í Felli) + - Telegu (Veeven). Closes: #593097 + + * Update the kfreebsd daily netboot download. + * Fix wrong Windows 7 detection as Windows NT and specify the device name in + the bootmgr (Closes: #595140) + + -- Didier Raboud <didier@raboud.com> Wed, 01 Sep 2010 23:35:46 +0200 + win32-loader (0.6.18) unstable; urgency=low [ Updated translations ] diff -Nru win32-loader-0.6.18/l10n/Makefile win32-loader-0.6.19/l10n/Makefile --- win32-loader-0.6.18/l10n/Makefile 2010-08-01 17:35:37.000000000 +0200 +++ win32-loader-0.6.19/l10n/Makefile 2010-09-01 11:59:48.000000000 +0200 @@ -1,7 +1,7 @@ # Add only languages really supported by NSIS there # For others, a PO file may be added and kept until NSIS is translated -# Languages not yet supported by NSIS: ast bn dz kk ml vi -LINGUAS= ar be bg bs ca cs de el en eo es eu fi fr ga gl he hr hu it ja ko lt nb nl pl pt pt_BR ro ru sk sl sq sv th tr uk zh_CN zh_TW +# Languages not yet supported by NSIS: ast bn dz kk ml te vi +LINGUAS= ar be bg bs ca cs de el en eo es eu fi fr ga gl he hr hu is it ja ko lt nb nl pl pt pt_BR ro ru sk sl sq sv th tr uk zh_CN zh_TW all: templates/all.nsh templates/dialog.nsh po/messages.pot diff -Nru win32-loader-0.6.18/l10n/po/ast.po win32-loader-0.6.19/l10n/po/ast.po diff -Nru win32-loader-0.6.18/l10n/po/es.po win32-loader-0.6.19/l10n/po/es.po diff -Nru win32-loader-0.6.18/l10n/po/is.po win32-loader-0.6.19/l10n/po/is.po diff -Nru win32-loader-0.6.18/l10n/po/te.po win32-loader-0.6.19/l10n/po/te.po diff -Nru win32-loader-0.6.18/main.nsi win32-loader-0.6.19/main.nsi --- win32-loader-0.6.18/main.nsi 2010-05-05 18:15:02.000000000 +0200 +++ win32-loader-0.6.19/main.nsi 2010-09-01 15:21:18.000000000 +0200 @@ -168,22 +168,18 @@ ; Windows version is another abort condition Var /GLOBAL windows_boot_method - ${If} ${IsNT} - StrCpy $windows_boot_method ntldr - Goto windows_version_ok - ${Endif} ${If} ${AtMostWinME} StrCpy $windows_boot_method direct + ${If} ${IsNT} + StrCpy $windows_boot_method ntldr + ${Endif} Goto windows_version_ok ${Endif} ${If} ${AtMostWin2003} StrCpy $windows_boot_method ntldr Goto windows_version_ok ${Endif} - ${If} ${AtMostWinVista} -; In the default install, "system partition" is not mounted. We need a way -; around this before Windows 7 can be enabled. -; ${OrIf} ${IsWin7} + ${If} ${AtMostWin7} StrCpy $windows_boot_method bootmgr Goto windows_version_ok ${Endif} @@ -382,7 +378,7 @@ StrCpy $base_url "http://d-i.debian.org/daily-images/$arch/daily/netboot/$gtkdebian-installer/$arch" ${Endif} ${ElseIf} $kernel == "kfreebsd" - StrCpy $base_url "http://d-i.debian.org/daily-images/kfreebsd-$arch/daily/monolithic" + StrCpy $base_url "http://d-i.debian.org/daily-images/kfreebsd-$arch/daily/netboot/debian-installer/kfreebsd-$arch/" ${EndIf} ${Else} ${If} $kernel == "linux" @@ -882,6 +878,7 @@ ${Endif} nsExec::Exec '"$bcdedit" /set $0 device boot' nsExec::Exec '"$bcdedit" /set $0 path \g2ldr.mbr' + nsExec::Exec '"$bcdedit" /set $0 device partition=$c' nsExec::Exec '"$bcdedit" /displayorder $0 /addlast' ${Endif}
Attachment:
signature.asc
Description: This is a digitally signed message part.