grub: new changes from Debian require merging

grub (0.97-1ubuntu1) dapper; urgency=low

  * Resynchronise with Debian.
  * Drop Nathaniel McCallum's nonaltoptions patch, done differently in
    Debian (as defoptions); added migration code to deal with old Ubuntu
    menu.lst files.
  * Drop Matthew Garrett's stage 2 drive fallback patch, since upstream has
    implemented a different solution which appears to address essentially
    the same problem.
  * Generated debian/control once from debian/control.in using
    type-handling, but continue to avoid the build-dependency on
    type-handling; the generated debian/control is in the source package.
  * Disable fix_amd64_compile.diff for now; it causes configure to fail with
    "GRUB requires a working absolute objcopy; upgrade your binutils".

 -- Colin Watson <email address hidden> Wed, 30 Nov 2005 18:00:45 +0000

grub (0.97-1) unstable; urgency=low

  * New upstream release: (closes: #303967)
    Patches:
    - 2gb_limit.diff: resync;
    - kfbsd_chainload.diff: dropped; not needed;
    - fwritable-strings_remove.diff: dropped, merged upstream;
    - console_current_color.diff: dropped, merged upstream;
    - xsi_mkbimage.diff: dropped, merged upstream;
    - smp-imps.diff: dropped, not needed;
    - revert_grub-set-default.diff: dropped, not needed;
    - savedefault.diff: disabled, don't apply anymore; (reopen: #195833)
    - static_subfunc.diff: dropped, not needed;
    Fixes:
    - Fallback to a sane console if fail to set graphical mode; (closes: #267224)
  * Doesn't output a error when no kernel is installed. (closes: #336730)
  * Make update-grub output consistent. (closes: #336729)
  * Applied patch from Antonio Kanouras <email address hidden>
    to remove bashism from update-grub and allow it to run with
    dash. (closes: #337145)
  * Add a watch file to be easier to identify upstream releases
  * debian/patches/fix_amd64_compile.diff: Added. Ensure that we build in
    64bit mode in x86_64 arch. (closes: #337288)
  * Start to use automake1.9 when building.
  * Applied patch from Marco Amadori <email address hidden> to
    document, in menu.lst, to avoid _default saved_ option in case of
    being use dmraid.
  * Applied patch from Jason Thomas <email address hidden> to give a example
    how to use kernel options to specific kernel version. (closes: #338371)
  * Applied patches from Andrew Stribblehill <email address hidden> and Tony
    Mancill <email address hidden> to fix grub-floppy to don't falsely
    reports "stage1" as missing. (closes: #288678)
  * Applied patch from Free Ekanayaka <email address hidden> to allow custom
    title name in menu.lst. (closes: #298110, #138318)
  * Applied patch from Georg Wittenburg <email address hidden> to
    allow specific options to default entry. (closes: #266101)
  * Fix documentation installing. (closes: #339687)
  * Clean the source code. (closes: #340656)
  * Patches stolen from other vendors:
    - [SuSE] initrd_max_address.diff: added. This change the max address
      to host initrd image and add a safe default value in case of failure;
    - [Fedora] splashimage_help.diff: added. Add documentation about
      splashimage option; (closes: #200269)
    - [Fedora] grub-i...