[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#612224: marked as done (debian-cd: Squeeze CDs include tools/win32-loader/unstable/win32-loader.exe (and other suites))

Your message dated Fri, 04 Mar 2011 15:32:09 +0000
with message-id <E1PvWzB-000493-8D@franck.debian.org>
and subject line Bug#612224: fixed in debian-cd 3.1.6
has caused the Debian Bug report #612224,
regarding debian-cd: Squeeze CDs include tools/win32-loader/unstable/win32-loader.exe (and other suites)
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
612224: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612224
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: debian-cd
Version: 3.1.5
Severity: important
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

thanks to recent changes in dak, the win32-loader package has the ability to 
upload byhand files which land in tools/win32-loader/$(SUITE)/ on the Debian 
mirrors (with $SUITE being {stable,testing,unstable}).

It appears that the complete tools/ directory is copied on the x86 CDs, which
already includes win32-loader.exe in another form.

So what we have now is:

$ lesspipe debian-6.0.0-amd64-netinst.iso | grep .exe$
/setup.exe
/tools/loadlin.exe
/tools/win32-loader/testing/win32-loader.exe
/tools/win32-loader/unstable/win32-loader.exe

(Current 6.0.0 CDs lack the …/stable/… version as they have been built before
the win32-loader.exe file had been copied from testing to stable during the 
release process.)

setup.exe is win32-loader.exe in its "CD flavour", where the win32-loader.exe 
under the tools/ directory on both CDs and mirrors are win32-loader.exe in its
"standalone flavour" (which permits the download of kernels and initrd's from 
internet), hence not of real use on CD's. 

A proposed patch is attached (with twice the same information as
tools/boot/{sid,squeeze} are symlinks in the debian-cd version in current
stable.)

Thanks in advance for considering this for 6.0.* .

Cheers,

OdyX

- -- System Information:
Debian Release: 6.0
  APT prefers unstable
  APT policy: (750, 'unstable'), (700, 'testing-proposed-updates'), (700, 'testing'), (101, 'testing-proposed-updates'), (101, 'experimental'), (101, 'unstable'), (101, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.37-trunk-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_CH.UTF-8, LC_CTYPE=fr_CH.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iJwEAQECAAYFAk1PGNMACgkQKA1Vt+jBwDgXNgP+KXVF1NLJRWDR7t2M+lospVfR
wTTIfhbS6DodWAHG3Tzr7wNOKvN1r/0dXCFVjcZO0dBkxBN4xmtf1aUDTnbMmUhx
q171uOOU4r8JJv+htz8qi5Tn1qs5iva+wWzcJ1Kjhsb4KqTcPR30+oIgKQXw9CMa
PjqO5/35oa1ms7VMnkk=
=Xw0O
-----END PGP SIGNATURE-----

diff -Nru debian-cd-3.1.5/debian/changelog debian-cd-3.1.5+squeeze1/debian/changelog
--- debian-cd-3.1.5/debian/changelog	2011-02-03 00:50:34.000000000 +0100
+++ debian-cd-3.1.5+squeeze1/debian/changelog	2011-02-06 22:47:42.000000000 +0100
@@ -1,3 +1,9 @@
+debian-cd (3.1.5+squeeze1) UNRELEASED; urgency=low
+
+  * Remove win32-loader standalone flavours from the tools/ directory on x86.
+
+ -- Didier Raboud <odyx@debian.org>  Sun, 06 Feb 2011 21:36:36 +0100
+
 debian-cd (3.1.5) unstable; urgency=high
 
   [ Steve McIntyre ]
diff -Nru debian-cd-3.1.5/tools/boot/sid/boot-x86 debian-cd-3.1.5+squeeze1/tools/boot/sid/boot-x86
--- debian-cd-3.1.5/tools/boot/sid/boot-x86	2010-12-26 20:24:30.000000000 +0100
+++ debian-cd-3.1.5+squeeze1/tools/boot/sid/boot-x86	2011-02-06 21:36:20.000000000 +0100
@@ -123,6 +123,8 @@
 	   [ "$OMIT_DOC_TOOLS" != "1" ] ; then
 		echo "  Adding tools to CD1"
 		$BASEDIR/tools/add_files $CDDIR $MIRROR tools
+		# Remove the win32-loader/ subdirectory from tools, as d-i already installs setup.exe
+		rm -Rf $CDDIR/tools/win32-loader
 	fi
 fi
 
diff -Nru debian-cd-3.1.5/tools/boot/squeeze/boot-x86 debian-cd-3.1.5+squeeze1/tools/boot/squeeze/boot-x86
--- debian-cd-3.1.5/tools/boot/squeeze/boot-x86	2010-12-26 20:24:30.000000000 +0100
+++ debian-cd-3.1.5+squeeze1/tools/boot/squeeze/boot-x86	2011-02-06 21:36:20.000000000 +0100
@@ -123,6 +123,8 @@
 	   [ "$OMIT_DOC_TOOLS" != "1" ] ; then
 		echo "  Adding tools to CD1"
 		$BASEDIR/tools/add_files $CDDIR $MIRROR tools
+		# Remove the win32-loader/ subdirectory from tools, as d-i already installs setup.exe
+		rm -Rf $CDDIR/tools/win32-loader
 	fi
 fi

--- End Message ---
--- Begin Message --- 
Source: debian-cd
Source-Version: 3.1.6

We believe that the bug you reported is fixed in the latest version of
debian-cd, which is due to be installed in the Debian FTP archive:

debian-cd_3.1.6.dsc
  to main/d/debian-cd/debian-cd_3.1.6.dsc
debian-cd_3.1.6.tar.gz
  to main/d/debian-cd/debian-cd_3.1.6.tar.gz
debian-cd_3.1.6_all.deb
  to main/d/debian-cd/debian-cd_3.1.6_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 612224@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Steve McIntyre <93sam@debian.org> (supplier of updated debian-cd package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Fri, 04 Mar 2011 14:56:50 +0000
Source: debian-cd
Binary: debian-cd
Architecture: source all
Version: 3.1.6
Distribution: unstable
Urgency: low
Maintainer: Debian CD Group <debian-cd@lists.debian.org>
Changed-By: Steve McIntyre <93sam@debian.org>
Description: 
 debian-cd  - Tools for building (Official) Debian CD set
Closes: 612007 612074 612224 613751 615043
Changes: 
 debian-cd (3.1.6) unstable; urgency=low
 .
   [ Raphaël Hertzog ]
   * Add the missing accent in my family name in Uploaders.
   * Drop Frans Pop from Uploaders, RIP.
 .
   [ Steve McIntyre ]
   * Start wheezy development, doing "svn cp squeeze wheezy" and
     "s/squeeze/wheezy/" in various places.
   * Add support for over-riding disc size on demand, used for some of the
     squeeze release builds.
   * Add disk size definitions for 1/2/4/8 GB USB sticks.
   * Extend the size-override code to allow to override an individual disc
     in the set (e.g. to make the first DVD fit on a 4GB USB
     stick). Closes: #612074
   * Special-case builds of source-only discs: if we think we've
     overflowed the disc size, try to carry on for a few more packages
     to get closer to actually filling the disc. Closes: #613751.
   * Path to sparc daily builds has changed.
   * armel hasn't booted off CD in ages for us; comment out the DI_WWW_HOME
     definition to stop the mirror script complaining.
   * Add more checksum types to generated Release files; go from md5 only
     to md5, sha1, sha256 and sha512.
   * tools/start_new_disc: tone down messages about missing
     {BASE,UDEB}_{INCLUDE,EXCLUDE} files from ERROR to WARNING.
     Closes: #615043
 .
   [ Otavio Salvador ]
   * Add btrfs-tools on required packages by installer. Closes: #612007.
 .
   [ Didier Raboud ]
   * Remove win32-loader standalone flavours from the tools/ directory on
     x86. Closes: #612224
Checksums-Sha1: 
 6275e77d0877cbca72a99dbde377e626d77019c7 1628 debian-cd_3.1.6.dsc
 c2ad09cf5270699b1b8598680471e584ae45e4d0 1171109 debian-cd_3.1.6.tar.gz
 cbaa54bf7f20d8995035a059f3d7ac5e08a29076 1161112 debian-cd_3.1.6_all.deb
Checksums-Sha256: 
 a567e8d0c903dab8a0cfb2aa9b190828b8268af738a92f8e4d33f7029cbf7c72 1628 debian-cd_3.1.6.dsc
 8f3248c1138f99435cbc43cc161da99a4c53c755ac1b086976b2e84aed27d5ce 1171109 debian-cd_3.1.6.tar.gz
 8f4182fae9f75d2d6f9ef20d80e21b8544dd5ac7f6239f32139f2b1981c4ea15 1161112 debian-cd_3.1.6_all.deb
Files: 
 9bc92c1761cd0f448b8c8fc81b3943f6 1628 admin extra debian-cd_3.1.6.dsc
 9fbd690367d8cc49e55f59966664d9ae 1171109 admin extra debian-cd_3.1.6.tar.gz
 1a35941b6bdfbcdf153c2ce8072b86e4 1161112 admin extra debian-cd_3.1.6_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQIcBAEBCAAGBQJNcQRbAAoJEFh5eVc0QmhOn/gP/ivirXgqdNXUHyRlj/49tN8R
bTXiF8SMunoopNktosMzhFUd6RDbXMlmj/kSdayggzZsQ6LF+KPlIfCXIDxMk2Ro
Yy1S31Ix+17uQeAC7u174IvJfEBJ6VbZGsaKZyhxTVlNJrGCm0xXU9ASU5yFg6o9
YwBOK5a1LemjDXG5BYrn7BrC4a/b6QOEtXFCdWIFWibwJUlY5klSt8j+y8+WHWe9
mCwcoNBrFInxVAarvddsO5b9S8n3OToBPrQphAaXL1zzxWz4VTlox+txCUUP5Nj2
ibwlNZ79yo72u6xa59/yHOYuwqsbgqMITKty6aVtNL7BiB6kRoI4MS9NYwurxyUx
osIi7oD1NC/0wa4zB9T9vkB7S6ZMl6zM2u1IFTV47MgfDt/7N3LGnSb6mKtp5pH0
hBU0spFiLOFjrt+AQBQkIl4Ry2uilWaI8KbSg14nB/AcgpXJNFCd7tdTYbq+I1EU
V1mlaal4KD+pjO3WiH9vDvtF9POPuB4VsJuPCWYTH/XaQ+jYsAMO2ut/bt0+CwWm
rPiHH2JicI6yHZqkkAxyRkUnss1FxH6s1T3lK+jcshKA6Law1QVClJEoF20io8/o
sI09qRLqXyQqvR6a1Gx786/P//vOy2X8JQaS0MyNWz6b8KOIehbpJ1Zch5Wjk3uR
3uykRqCZ/3ERCspZeN9Q
=0pan
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: