-
Committer:
Package Import Robot
-
Author(s):
Colin Watson
-
Date:
2012-09-19 08:52:27 UTC
-
mfrom:
(1.15.16)
(93 sid)
-
mto:
This revision was merged to the branch mainline in
revision
101.
-
Revision ID:
package-import@ubuntu.com-20120919085227-6xipi7hpyw5jmk7r
Tags: 2.00-5
* Backport from upstream:
  - Remove extra layer of escaping from grub_probe.
  - Add efifwsetup module to reboot into firmware setup menu.
  - Revert incorrect off-by-one fix when embedding in MBR (LP: #1051154).
* Switch watch file to point to ftp.gnu.org.
* Build-depend on liblzma-dev, enabling 'grub-mkimage -C xz'.
* Adjust /etc/grub.d/30_os-prober to detect Ubuntu's use of "recovery"
  rather than "single".