--- Begin Message ---
Package: debian-cd
Version: 3.1.12
The alterations in response to bug 695080 go a long way to add support
to isolinux, but don't help for grub.
The attached patch file fixes that.
--
Robert Spencer
--- tools/start_new_disc~ 2013-04-01 01:26:54.000000000 +0000
+++ tools/start_new_disc 2013-04-17 12:25:22.000000000 +0000
@@ -39,6 +39,7 @@
if [ "$DISKINFO_DISTRO"x = ""x ] ; then
DISKINFO_DISTRO="Debian"
fi
+export DISKINFO_DISTRO
if [ $NUM_ARCHES = 1 ] ; then
case $ARCHES in
--- tools/boot/wheezy/boot-x86~ 2013-03-24 20:13:25.000000000 +0000
+++ tools/boot/wheezy/boot-x86 2013-04-17 12:58:44.000000000 +0000
@@ -419,7 +419,7 @@
# Create grub menu entries to match the isolinux ones
sed -i '/^menuentry/Q' $CDDIR/boot/grub/grub.cfg;
$BASEDIR/tools/boot/$DI_CODENAME/parse_isolinux \
- boot$N/isolinux $CDDIR $BASEDIR/data/$DI_CODENAME/grub-theme.in "Debian GNU/Linux $DEBVERSION" \
+ boot$N/isolinux $CDDIR $BASEDIR/data/$DI_CODENAME/grub-theme.in "$DISKINFO_DISTRO" "$DEBIAN_KERNEL" "$DEBVERSION" \
>> $CDDIR/boot/grub/grub.cfg
# Stuff the EFI boot files into a FAT filesystem, making it as
--- tools/boot/wheezy/parse_isolinux~ 2012-12-29 03:52:48.000000000 +0000
+++ tools/boot/wheezy/parse_isolinux 2013-04-17 11:50:32.000000000 +0000
@@ -14,7 +14,9 @@
my $isolinuxdir = shift or die "Need to know where the isolinux directory is!\n";
my $outdir = shift or die "Need to know where to write output!\n";
my $grub_theme = shift or die "Need input file location for base grub theme!\n";
-my $tl_desc = shift or die "Need a top-level description (e.g. Debian GNU/Linux 7.0)\n";
+my $tl_distro= shift or die "Need a top-level distro name (e.g. Debian)\n";
+my $tl_kernel= shift or die "Need a top-level kernel (e.g. GNU/Linux)\n";
+my $tl_version= shift or die "Need a top-level version (e.g. 7.0)\n";
my $theme_dir = "$outdir/boot/grub/theme";
my @cpp_and_opts = ('cpp',
'-traditional',
@@ -92,7 +94,7 @@
my $filename = shift;
my @args;
push(@args, @cpp_and_opts);
- push(@args, "-DTITLE=\"$tl_desc\"");
+ push(@args, "-DTITLE=\"$tl_distro $tl_kernel $tl_version\"");
for (my $i = 0; $i < $menudepth; $i++) {
push(@args, "-DMENU$i=\"" . $menu_title[$i] . "\"");
}
@@ -115,7 +117,7 @@
$menu{"number"} = "1";
$menu{"label"} = "top";
-$menu{"title"} = "Debian GNU/Linux Installer menu";
+$menu{"title"} = "$tl_distro $tl_kernel Installer menu";
$menu_title[$menudepth] = $menu{"title"};
my %kernel;
--- End Message ---
--- Begin Message ---
Source: debian-cd
Source-Version: 3.1.13
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.
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 705610@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: Tue, 30 Apr 2013 22:54:32 +0100
Source: debian-cd
Binary: debian-cd
Architecture: source all
Version: 3.1.13
Distribution: unstable
Urgency: medium
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: 703436 705594 705610
Changes:
debian-cd (3.1.13) unstable; urgency=medium
.
* The traditional "last upload before the stable release" upload...
.
[ Robert Spencer ]
* Use ARCHIVE_KEYRING_PACKAGE and ARCHIVE_KEYRING_FILE parameters to
not hardcode debian-archive-keyring and let derivatives use their
own keyring.
* Add further support for missing win32-loader.ini. Closes: #705594
* Allow for override of distro name etc. in grub.cfg for EFI boot too.
Closes: #705610
.
[ Steve McIntyre ]
* Tweak handling of {udeb,base}_{include,exclude} files so multi-arch
builds should work better. Closes: #703436
* Remove the dpkg check for debootstrap version before passing the
--no-check-gpg option; we're not going to support debootstrap versions
so old that they don't support this flag, *and* the dpkg-query call
doesn't give us the right version anyway - we're using an extracted
copy from the archive, not the one that (might be) installed on our
build machine.
Checksums-Sha1:
d4b181cd1316869436ccf01cb5adba849defe1df 1680 debian-cd_3.1.13.dsc
b190c1c5d0c42df72e7a6a1bac2ce5bc7f474dc7 874044 debian-cd_3.1.13.tar.gz
035998b1adf825866cb682a4921bcda34591cba9 884818 debian-cd_3.1.13_all.deb
Checksums-Sha256:
b45f3063848e8abe0ea7164fbb95608483cd077e32d9a7f96a11abae2c16da92 1680 debian-cd_3.1.13.dsc
c2e6e26e80edc514d095b62822a98ee2b172ba65ee1f05b454d99aab8ce73d21 874044 debian-cd_3.1.13.tar.gz
f3a1638f0f00c21309eab76c98255197112f3696b3a9cdc5ccd45ac8af476c53 884818 debian-cd_3.1.13_all.deb
Files:
256e96a9cb0272cba6dc795403557b95 1680 admin extra debian-cd_3.1.13.dsc
bf355d0962f197e1360714f89e9a65f3 874044 admin extra debian-cd_3.1.13.tar.gz
94f8e9cfb72e2225b9b948aca3ebb194 884818 admin extra debian-cd_3.1.13_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBCAAGBQJRgD9xAAoJEFh5eVc0QmhO2kkP/R/X3ZgDd1ExuKEvMfueNQyq
g6cbqSWQEPVvt6o/PTvofeRvBh2sThTFK5FUiouAaGvlurU61w56/WHYX7k7afZa
th6bzKETCVa4/ekaYjShJv7m+vjboXOWn8Ena4QjRQNrpjlr1w4genH6f28D/EpK
1AbkSZpuqMHTPLFYRo14vqYCtQni+YjuavAgzM2zGcRr5R2XpzyPwPxaE4gtONSc
RnoffSpscTfVhguB8bVQYqbCeraKSsjLxr1l+NGcjnS2O8d2iTzxn+X/wyNtgJAi
dg31sulyF7Kh/7KpP41774MD4MLCuMcXd0Ndi5EgLhLuG+AC/E/JUaFbwwPOCXRI
39Dv+oTgc/G1ic/JclPqqeyQxVwSgfiuEfbS7fhmLTJNYIbkJ4X6hkhrtRAI6l1i
nNd8dwyhOgKAjRpkRRDSt0/4zGL1b7Vtd9JE6PQl5gMQxM3uZgpzZRljug3UOvYh
vcptlyPvNq/HrPMEY0cOTGhjRQ11Qs4R8voAf+MbwbubF7zlnFFMBMJl7lf9G4yG
enEbMPMYWp/ak6JSyXSorod5ah2h6mqgDksJTgZjeYuoUQf2FlEJyfaofEukYWuO
wnX24ACFjwGDOHz4RJ0qOguy/kBUIznHaplTNJ3C7puR/xw4i3BOPXQf0utxPaN7
W8lo5Z8WvdKGPWR3Ujdu
=obgc
-----END PGP SIGNATURE-----
--- End Message ---