merge the changes on the branch prepare_0_5_96 to the main trunk.

debian/changelog

@@ -1,3 +1,15 @@
+grub (0.5.96) unstable; urgency=low
+
+  * Many, many new features and bugfixes.  This is the final test release;
+    the next release will be version 1.0.
+  * Install HTML documentation in addition to Info pages.
+    (closes:bug#42242,bug#42273)
+  * Fix documentation to refer to /usr/sbin/grub as well as
+    /sbin/grub. (closes:bug#67132)
+  * Be more verbose about missing setup files. (closes:bug#71661)
+
+ -- Gordon Matzigkeit <gord@debian.org>  Wed,  4 Oct 2000 10:44:42 -0600
+
 grub (0.5.95) unstable; urgency=low
 
   * ReiserFS support from Jochen Hoenicke.

debian/rules

@@ -48,6 +48,13 @@ binary-arch:	checkroot build
 ## install files
 
 	dir=`cd debian/tmp && pwd` && make install DESTDIR=$$dir
+
+	top=`pwd` && cd debian/tmp/usr/share/doc/grub && \
+	  ln -s $$top/docs/{grub,multiboot}.texi . && \
+	  texi2html -split_chapter -I$$top/docs grub.texi && \
+	  texi2html -split_chapter -I$$top/docs multiboot.texi && \
+	  rm -f grub.texi multiboot.texi
+
 	gzip -f9 debian/tmp/usr/share/info/* debian/tmp/usr/share/man/*/*
 	strip -s debian/tmp/usr/sbin/grub debian/tmp/usr/bin/mbchk