please merge grub 0.97-29 from Debian unstable

grub (0.97-28ubuntu1) gutsy; urgency=low

  * Merge from debian unstable, remaining changes:
    - debian/control: build-depends on libc6-dev and gcc-3.4
    - debian/control: depends on volumeid, provide linux-boot-loader
    - debian/rules: use gcc-3.4
    - debian/patches/grub-install_storeversion.diff
    - debian/patches/quiet.diff
    - debian/patches/gpt.diff
    - debian/patches/grub-0.95-mem_lower.patch
    - update-grub: assorted Ubuntu tweaks
      - use the more portable printf instead of echo -e
      - warning about missing /boot/grub is split up
      - is_removable device handling
      - crashdump handling
      - get default root device from /etc/fstab
      - rename title to "Ubuntu"
      - quiet and splash default defoptions
      - rename "single-user" to "recovery"
      - timeout/hiddenmenu/colours defaults
      - robust oldversion handling
      - don't treat memtest as a kernel
      - convert_kopt_to_uuid
      - kopt_2_6 handling
      - no freebsd support
    - configure.ac: -fno-strict-aliasing
    - debian/grub.postinst: run update-grub on upgrade from dapper
  * debian/patches/quiet.diff: Fix "help quiet" segfault (Ubuntu bug #60163)
  * ubuntu_savedefault_option.diff: Configurable "savedefault" automagic
    option (default: false) for adding the savedefault command to menu
    entries (Ubuntu bug #66278)

This time I think I got the "help quiet" fix right.

FYI, I also tried to see if I could drop the gcc-3.4 dependency. However, grub built with gcc-4.1 segfaults at various places due to the sporty use of pointer arithmetic in several functions with variable arguments, maybe because the optimization makes for some surprises. I inserted proper va_arg handling instead and that worked fine AFAICS. However, there might be many other places things can go wrong in the same fashion, so I think it's safer to stay with gcc-3.4. I attach the patch here anyway if anyone is interested.

I think it's time to switch to grub2...

I've tried to apply the debdiff against the sources from Debian unstable, but they have just released 0.97-29.

Will you update your debdiff or should the gutsy upload be based upon 0.97-28?

OK, I'll update the debdiff then.

Here's a new debdiff against 0.97-29. Please upload before they change it again :)

Thanks Colin, for looking into this.

Thanks for this, Tormod - sorry I took so long to review it! I've uploaded your package with just two changes.

Firstly, use "LP: #nnnnn" rather than "Ubuntu #nnnnn" or any other similar syntax to refer to fixed bugs; using that exact syntax causes Launchpad to close the bugs automatically on upload, which is convenient. If you happen to use vim, then gutsy's version will highlight that; otherwise, look for Launchpad-Bugs-Fixed in the .changes file.

Secondly, please apply patches to debian/* directly rather than via debian/patches/*; having a patch applied to debian/* at build time is generally considered confusing. I know that debian/patches/ubuntu_update_grub.diff already patches debian/update-grub, but that's not actually applied and only kept around for reference in case we're ever crazy enough to reapply it.

Otherwise, good job!

(Of course I inadvertently built your source package in a Debian chroot so the bugs didn't get auto-closed anyway. Whoops. I'll close them by hand.)

Thanks for your advice and upload. The reason I used a separate patch file was that I thought it would keep the Ubuntu delta cleaner and easier to remove this patch and keep the rest if Debian includes the patch. FWIW I sent the patch to Debian the same day as I posted it here. I wish they were more responsive (like you) so we could avoid this double work. And then there are people who say that Ubuntu doesn't contribute back...