merge NMUs; mangle Julien's change into cdbs patch format

diff --cc debian/changelog
index c583fdce4e42b2b9311338df7f83f97a6851afcc,0d53fa8582bc7c7b430dd54d4991f3e6f7cdfb89..74bb30c6581b089c73155e0fa2d4523d36d37ed5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,18 +1,42 @@@
 +grub2 (1.98-1) UNRELEASED; urgency=low
 +
 +  * New upstream release (closes: #572898).
 +    - Fix grub-script-check to handle empty lines (closes: #572302).
 +    - Fix offset computation when reading last sectors.  Partition reads and
 +      writes within and outside a partition (closes: #567469, #567884).
 +    - Fix script execution error handling bug that meant that an error in a
 +      menuentry's last statement caused the whole menuentry to fail (closes:
 +      #566538, LP: #464743).
 +    - Support GRUB_GFXPAYLOAD_LINUX (closes: #536453, LP: #416772).
 +
 +  [ Samuel Thibault ]
 +  * Add GRUB_INIT_TUNE example to /etc/default/grub (closes: #570340).
 +
 +  [ Colin Watson ]
 +  * Build-depend on libusb-dev so that grub-emu is reliably built with USB
 +    support (closes: #572854).
 +  * Update directions in debian/rules on exporting grub-extras to account
 +    for it being maintained in Bazaar nowadays.
 +  * Add myself to Uploaders.
++  * Acknowledge NMUs, thanks to Torsten Landschoff and Julien Cristau.
 +
 + -- Colin Watson <cjwatson@debian.org>  Mon, 08 Mar 2010 21:22:03 +0000
 +
+ grub2 (1.98~20100128-1.2) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Stop setting gfxpayload=keep (closes: #567245).
+ 
+  -- Julien Cristau <jcristau@debian.org>  Sun, 14 Feb 2010 20:37:51 +0100
+ 
+ grub2 (1.98~20100128-1.1) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Apply trivial patch (already merged upstream) fixing the offset
+     computation for non-cached reads (closes: #567637).
+ 
+  -- Torsten Landschoff <torsten@debian.org>  Mon, 08 Feb 2010 22:15:01 +0100
+ 
  grub2 (1.98~20100128-1) unstable; urgency=low
  
    * New Bazaar snapshot.

diff --cc debian/patches/908_gfxpayload_keep_default.diff
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..704c7ee924e1d1801b46caafc9e6addb6d4671bf
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/908_gfxpayload_keep_default.diff
@@@ -1,0 -1,0 +1,36 @@@
++Description: Disable gfxpayload=keep by default
++ Setting gfxpayload=keep has been known to cause efifb to be inappropriately
++ enabled.  In any case, with the current Linux kernel the result of this
++ option is that early kernelspace will be unable to print anything to the
++ console, so (for example) if boot fails and you end up dumped to an
++ initramfs prompt, you won't be able to see anything on the screen.  As such
++ it shouldn't be enabled by default in Debian, no matter what kernel options
++ are enabled.
++ .
++ gfxpayload=keep is a good idea but rather ahead of its time ...
++Author: Colin Watson <cjwatson@debian.org>
++Bug-Debian: http://bugs.debian.org/567245
++Forwarded: no
++Last-Update: 2010-03-09
++
++diff -Nur -x '*.orig' -x '*~' grub2/util/grub.d/10_linux.in grub2.new/util/grub.d/10_linux.in
++--- grub2/util/grub.d/10_linux.in     2010-03-09 11:35:45.000000000 +0000
+++++ grub2.new/util/grub.d/10_linux.in 2010-03-09 11:37:18.000000000 +0000
++@@ -64,16 +64,7 @@
++   printf "menuentry \"${title}\" ${CLASS} {\n" "${os}" "${version}"
++   save_default_entry | sed -e "s/^/\t/"
++ 
++-  # Use ELILO's generic "efifb" when it's known to be available.
++-  # FIXME: We need an interface to select vesafb in case efifb can't be used.
++-  if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
++-      if grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null \
++-       && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" /boot/config-${version} 2> /dev/null; then
++-       cat << EOF
++-     set gfxpayload=keep
++-EOF
++-      fi
++-  else
+++  if [ "x$GRUB_GFXPAYLOAD_LINUX" != x ]; then
++        cat << EOF
++      set gfxpayload=$GRUB_GFXPAYLOAD_LINUX
++ EOF