diff --git a/debian/changelog b/debian/changelog index 33afb489e..9bea7352e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ grub2 (2.00-16) UNRELEASED; urgency=low * Make reportbug script file robust against su authentication failures and missing LVM commands. + * Backport from upstream: + - Move @itemize after @subsection to satisfy texinfo-5.1. -- Colin Watson Sun, 11 Aug 2013 12:12:54 +0100 diff --git a/debian/patches/series b/debian/patches/series index 774634b4e..d8144937d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -47,3 +47,4 @@ install_bios_setup_path.patch os_prober_efi.patch acpihalt_improvements.patch script_check_no_commands.patch +texinfo_ordering.patch diff --git a/debian/patches/texinfo_ordering.patch b/debian/patches/texinfo_ordering.patch new file mode 100644 index 000000000..fd546040f --- /dev/null +++ b/debian/patches/texinfo_ordering.patch @@ -0,0 +1,21 @@ +Description: Move @itemize after @subsection to satisfy texinfo-5.1 +Author: Bryan Hundven +Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/4813 +Forwarded: not-needed +Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/4813 +Last-Update: 2013-08-11 + +Index: b/docs/grub-dev.texi +=================================================================== +--- a/docs/grub-dev.texi ++++ b/docs/grub-dev.texi +@@ -1394,8 +1394,8 @@ + + @node Bitmap API + @section Bitmap API +-@itemize + @subsection grub_video_bitmap_create ++@itemize + @item Prototype: + @example + grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format) diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi index a4a38206e..f74c96602 100644 --- a/docs/grub-dev.texi +++ b/docs/grub-dev.texi @@ -1394,8 +1394,8 @@ grub_video_blit_glyph (&glyph, color, 0, 0); @node Bitmap API @section Bitmap API -@itemize @subsection grub_video_bitmap_create +@itemize @item Prototype: @example grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format)