Le dimanche, 7 août 2011 16.13:47, Didier Raboud a écrit : > By the way, what more should I do to get this fixed ? After a short chat with Adam over IRC, the suggested next step was "please send an up-to-date debdiff to the bug". Here it is. You can also find the "cherry-picks" chain on the win32-loader repository: http://anonscm.debian.org/gitweb/?p=d-i/win32-loader.git;a=shortlog;h=refs/heads/master-squeeze Comments ? Cheers, OdyX
diff -Nru win32-loader-0.6.21/debian/changelog win32-loader-0.6.21+squeeze0/debian/changelog
--- win32-loader-0.6.21/debian/changelog 2010-11-28 16:58:50.000000000 +0100
+++ win32-loader-0.6.21+squeeze0/debian/changelog 2011-08-24 18:19:06.000000000 +0200
@@ -1,3 +1,19 @@
+win32-loader (0.6.21+squeeze0) stable; urgency=low
+
+ The "GPL compliance" release.
+
+ * Add a dpkg-distaddfile byhand call to install win32-loader-
+ standalone.exe as tools/$(SUITE)/win32-loader.exe on the mirrors.
+ * Document which packages in which versions are embedded in the
+ standalone flavour.
+ * Add acknowledgement to NSIS in the companion text file.
+ * Include version number in the companion text.
+ * Update debian/copyright and the companion text to point to the real
+ source locations.
+ * Use the Built-Using field and enhance the sources documentation.
+
+ -- Didier Raboud <didier@raboud.com> Wed, 24 Aug 2011 18:19:04 +0200
+
win32-loader (0.6.21) unstable; urgency=low
[ Updated translations ]
diff -Nru win32-loader-0.6.21/debian/control win32-loader-0.6.21+squeeze0/debian/control
--- win32-loader-0.6.21/debian/control 2010-08-01 16:01:28.000000000 +0200
+++ win32-loader-0.6.21+squeeze0/debian/control 2011-08-24 18:11:09.000000000 +0200
@@ -20,6 +20,7 @@
Package: win32-loader
Architecture: all
Depends: ${misc:Depends}, base-files (>= 4.0.1~)
+Built-Using: ${w32-loader:built-using}
Suggests: wine
Description: Debian-Installer loader for win32
This package provides a win32 program that can be used as a loader for
diff -Nru win32-loader-0.6.21/debian/copyright win32-loader-0.6.21+squeeze0/debian/copyright
--- win32-loader-0.6.21/debian/copyright 2010-04-28 14:29:33.000000000 +0200
+++ win32-loader-0.6.21+squeeze0/debian/copyright 2011-08-24 18:12:12.000000000 +0200
@@ -2,7 +2,7 @@
on Fri, 18 May 2007 18:34:48 +0200.
The original source can always be found at:
- http://ftp.debian.org/dists/unstable/main/source/
+ http://ftp.debian.org/debian/pool/main/w/win32-loader/
Copyright (C) 2007,2008,2009 Robert Millan
Copyright (C) 2010 Didier Raboud
diff -Nru win32-loader-0.6.21/debian/README.source win32-loader-0.6.21+squeeze0/debian/README.source
--- win32-loader-0.6.21/debian/README.source 1970-01-01 01:00:00.000000000 +0100
+++ win32-loader-0.6.21+squeeze0/debian/README.source 2011-08-24 18:01:33.000000000 +0200
@@ -0,0 +1,15 @@
+==== README.source for win32-loader ====
+
+When uploading this package, it is possible to add win32-loader-standalone.exe
+as debian/tools/win32-loader/$(SUITE)/win32-loader.exe on the mirrors.
+
+If you NMU this package, be sure to have the BYHAND variable set correctly; a
+reasonable policy is:
+
+ - set BYHAND to "yes" for all uploads towards unstable,
+ - set BYHAND to "no" for all uploads towards experimental (as it will not
+ work),
+ - coordinate with FTP Masters (at least) and Release Team (if needed) for
+ all other cases.
+
+ -- Didier Raboud <odyx@debian.org> Tue, 25 Jan 2011 23:26:22 +0100
diff -Nru win32-loader-0.6.21/debian/rules win32-loader-0.6.21+squeeze0/debian/rules
--- win32-loader-0.6.21/debian/rules 2010-04-28 14:29:33.000000000 +0200
+++ win32-loader-0.6.21+squeeze0/debian/rules 2011-08-24 18:12:12.000000000 +0200
@@ -1,5 +1,37 @@
#!/usr/bin/make -f
+# Install the win32-loader-standalone.exe as debian/tools/win32-loader/$(SUITE)/win32-loader.exe on the mirrors
+BYHAND ?= yes
+
+W32_VERSION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+W32_BYHAND_NAME := win32-loader_$(W32_VERSION)_all
+
+B_D_PACKAGES := grub-pc cpio-win32 gzip-win32
+
+PACKAGES_LIST := $(shell set -e; \
+ for p in ${B_D_PACKAGES}; \
+ do \
+ if test `dpkg-query --showformat='x$${Source}x' --show $$p` = "xx"; \
+ then \
+ dpkg-query --showformat='$${Package;-25} $${Version;-25} http://ftp.debian.org/debian/pool/main/$${Package;1}/$${Package}\\n' --show $$p; \
+ else \
+ dpkg-query --showformat='$${Package;-25} $${Version;-25} http://ftp.debian.org/debian/pool/main/$${Source;1}/$${Source}\\n' --show $$p; \
+ fi; \
+ done)
+
+BUILT_USING_LIST := $(shell set -e; \
+ for p in ${B_D_PACKAGES}; \
+ do \
+ if test `dpkg-query --showformat='x$${Source}x' --show $$p` = "xx"; \
+ then \
+ dpkg-query --showformat='$${Package} (= $${Version}), ' --show $$p; \
+ else \
+ dpkg-query --showformat='$${Source} (= $${Version}), ' --show $$p; \
+ fi; \
+ done)
+
+NSIS_VERSION := $(shell dpkg-query -f='$${Version}' -W nsis )
+
%:
dh $@
@@ -7,9 +39,29 @@
# Build the standalone version
STANDALONE=yes dh_auto_build
mv win32-loader.exe win32-loader-standalone.exe
+
+ # Prepare the README file
+ awk '{sub(/@PACKAGES_LIST@/,"$(PACKAGES_LIST)")}1 \
+ {sub(/@NSIS_VERSION@/,"$(NSIS_VERSION)")}1 \
+ {sub(/@W32_VERSION@/,"$(W32_VERSION)")}1' \
+ debian/win32-loader_doc.txt > $(W32_BYHAND_NAME).txt
+ cat debian/copyright >> $(W32_BYHAND_NAME).txt
# Build the cdrom version
dh_auto_build
override_dh_auto_clean:
dh_auto_clean
rm -f win32-loader-standalone.exe
+
+override_dh_builddeb:
+ dh_builddeb
+ifeq ($(BYHAND),yes)
+ cp win32-loader-standalone.exe ../$(W32_BYHAND_NAME).exe
+ dpkg-distaddfile $(W32_BYHAND_NAME).exe byhand -
+
+ cp $(W32_BYHAND_NAME).txt ../
+ dpkg-distaddfile $(W32_BYHAND_NAME).txt byhand -
+endif
+
+override_dh_gencontrol:
+ dh_gencontrol -- -Vw32-loader:built-using="$(BUILT_USING_LIST)"
diff -Nru win32-loader-0.6.21/debian/win32-loader_doc.txt win32-loader-0.6.21+squeeze0/debian/win32-loader_doc.txt
--- win32-loader-0.6.21/debian/win32-loader_doc.txt 1970-01-01 01:00:00.000000000 +0100
+++ win32-loader-0.6.21+squeeze0/debian/win32-loader_doc.txt 2011-08-24 18:08:55.000000000 +0200
@@ -0,0 +1,44 @@
+===== Win32-Loader - @W32_VERSION@ =====
+
+== What is Win32-Loader? ==
+
+win32-loader is a component of the Debian-Installer that runs on Windows and
+has the ability to load the actual installer either from the network or from
+CD-ROM media (as in the version included in the official CD images).
+
+This executable is the standalone flavour, which downloads the Debian
+Installer from official Debian mirrors.
+
+== How does it work? ==
+
+After a GPL license acceptance, the executable prompts the user for some
+options and tries to get defaults from the Windows environment. It then
+downloads the Debian installer and kernel from official Debian mirrors. It
+puts them in a Windows directory and safely modifies the Windows bootloader to
+enable a choice between the legacy Windows installation and the Debian
+installer at boot time.
+
+On the next reboot, the user can choose to continue the installation of
+Debian. The installation will be run using the defaults gathered from the
+runtime analysis and user prompting.
+
+== Removal ==
+
+When win32-loader.exe is uninstalled, it removes the Debian-Installer image
+and kernel and restores the Windows bootloader settings.
+
+== NSIS ==
+
+win32-loader is heavily based on the "Nullsoft Scriptable Install System". In
+fact it could not have seen the light without the flexibility and all the
+features NSIS provides. This win32-loader.exe was built using the NSIS Debian
+package in its @NSIS_VERSION@ version.
+
+== Embedded software ==
+
+win32-loader in its standalone flavour embeds various files and win32
+executables from the following Debian packages:
+
+@PACKAGES_LIST@
+== Authors and licensing ==
+
Attachment:
signature.asc
Description: This is a digitally signed message part.