From cec4786ec2d878c18929aced456f573800e09398 Mon Sep 17 00:00:00 2001 From: gord Date: Mon, 26 Jul 1999 22:58:10 +0000 Subject: [PATCH] Final touches for release. --- AUTHORS | 2 ++ ChangeLog | 5 +++++ NEWS | 2 +- debian/README.debian | 7 +++---- debian/changelog | 8 +++++--- debian/control | 4 ++-- debian/rules | 14 +++++--------- docs/Makefile.am | 6 ++++++ docs/Makefile.in | 5 +++++ docs/grub.texi | 2 +- 10 files changed, 35 insertions(+), 20 deletions(-) diff --git a/AUTHORS b/AUTHORS index c13a49a6a..e086a333a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,3 +13,5 @@ began the implementation of /sbin/grub. OKUJI Yoshinori contributed many bugfixes and new features, such as working LBA support, and /sbin/grub support for configuration files. + +Peter Astrand added support for a color menu. diff --git a/ChangeLog b/ChangeLog index a510b75f8..480056013 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-07-15 Gordon Matzigkeit + + * docs/Makefile.am (grub.info): Use an ugly hack to downgrade + grub.texi so that it works with Debian's version of texinfo. + 1999-07-26 OKUJI Yoshinori * stage2/bios.c (get_diskinfo): When DRIVE is a floppy drive, diff --git a/NEWS b/NEWS index 2b4a40e56..3f4dacd17 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ NEWS - list of user-visible changes between releases of GRUB -New: +New in 0.5.92 - 1999-07-26: * Bug fixes (i.e. Stage 1.5 can work fine again). * The /sbin/grub stage2 simulator now works at least on GNU/Linux, and uses the Linux HDIO_GETGEO ioctl to determine hard disk geometry. diff --git a/debian/README.debian b/debian/README.debian index f0a2c7c57..03214f519 100644 --- a/debian/README.debian +++ b/debian/README.debian @@ -14,11 +14,10 @@ edit configuration files or rerun a special installation program. NOTE: GRUB does not yet have a simple installation mechanism, but we're working on this, so please don't report it as a bug. Until -then, read the documentation (starting with docs/grub.html or -docs/install.html), and copy the binary files in /share/grub/$(HWARCH) -to /boot/grub. +then, read the Texinfo documentation, and copy the binary files in +/usr/lib/grub/$(HWARCH) to /boot/grub. -WARNING: Never use the binary files in /share/grub directly +WARNING: Never use the binary files in /usr/lib/grub directly (i.e. without first copying them to /boot/grub), or else your system will break the next time you upgrade. diff --git a/debian/changelog b/debian/changelog index a8aa09c02..373f51391 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ grub (0.5.92) unstable; urgency=low - * + * Data files are now in /usr/lib/grub/$(HWARCH). + * Unix boot utility available as /usr/sbin/grub. + * Full Texinfo documentation. - -- + -- GRUB Maintainers Mon, 26 Jul 1999 12:46:37 -0600 grub (0.5.91) unstable; urgency=low @@ -72,5 +74,5 @@ grub (0.4-1) unstable; urgency=low Local variables: mode: debian-changelog -add-log-mailing-address: "gord@debian.org" +add-log-mailing-address: "bug-grub@gnu.org" End: diff --git a/debian/control b/debian/control index bf05c1a3d..4778a1a85 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Architecture: i386 hurd-i386 Depends: ${shlibs:Depends} Description: GRand Unified Bootloader GRUB is a GPLed bootloader intended to unify bootloading across x86 - operating systems. In addition to loading Linux and FreeBSD, it - implements the Multiboot standard, which allows for flexible loading + operating systems. In addition to loading the Linux and *BSD kernels, + it implements the Multiboot standard, which allows for flexible loading of multiple boot images (needed for modular kernels such as the GNU Hurd). diff --git a/debian/rules b/debian/rules index ed6e4667a..14c114f39 100644 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ INSTALL_PROGRAM = $(INSTALL) -m 755 build: $(checkdir) - ./configure --prefix= --datadir='$$(prefix)/lib' + ./configure --prefix=/usr make echo timestamp > build @@ -31,18 +31,14 @@ binary-arch: checkroot build $(checkdir) -rm -rf debian/tmp ## make dirs - install -d debian/tmp debian/tmp/usr/doc/grub/docs debian/tmp/DEBIAN + install -d debian/tmp debian/tmp/usr/doc/grub debian/tmp/DEBIAN ## install files dir=`cd debian/tmp && pwd` && make install DESTDIR=$$dir - -rmdir debian/tmp/sbin - mv debian/tmp/info debian/tmp/usr/info - - cp docs/*.txt docs/*.html debian/tmp/usr/doc/grub/docs/ - $(INSTALL_DATA) docs/TODO debian/tmp/usr/doc/grub/docs/ - $(INSTALL_DATA) docs/BUGS debian/tmp/usr/doc/grub/docs/ - $(INSTALL_DATA) NEWS debian/tmp/usr/doc/grub/docs/ + $(INSTALL_DATA) TODO debian/tmp/usr/doc/grub/ + $(INSTALL_DATA) BUGS debian/tmp/usr/doc/grub/ + $(INSTALL_DATA) NEWS debian/tmp/usr/doc/grub/ $(INSTALL_DATA) ChangeLog debian/tmp/usr/doc/grub/changelog gzip -f9 debian/tmp/usr/doc/grub/changelog diff --git a/docs/Makefile.am b/docs/Makefile.am index 45d123e32..245df95d2 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -5,6 +5,12 @@ noinst_SCRIPTS = $(HELP2MAN) EXTRA_DIST = menu.lst $(man_MANS) $(noinst_SCRIPTS) +# FIXME: Use this rule until Debian has the new Texinfo. +grub.info: grub.texi + @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] + cd $(srcdir) \ + && sed 's/@command/@file/g; s/ifnottex/ifinfo/' grub.texi | $(MAKEINFO) + if GRUB_MAINT $(srcdir)/grub.8: ../grub/grub $(srcdir)/$(HELP2MAN) $(srcdir)/$(HELP2MAN) --name="the stage2 emulator shell" \ diff --git a/docs/Makefile.in b/docs/Makefile.in index 2e2121f41..538fc28fd 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -395,6 +395,11 @@ all-redirect all-am all install-strip installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +# FIXME: Use this rule until Debian has the new Texinfo. +grub.info: grub.texi + @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] + cd $(srcdir) \ + && sed 's/@command/@file/g; s/ifnottex/ifinfo/' grub.texi | $(MAKEINFO) @GRUB_MAINT_TRUE@$(srcdir)/grub.8: ../grub/grub $(srcdir)/$(HELP2MAN) @GRUB_MAINT_TRUE@ $(srcdir)/$(HELP2MAN) --name="the stage2 emulator shell" \ diff --git a/docs/grub.texi b/docs/grub.texi index faced2184..a43eb35b6 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -187,7 +187,7 @@ Standard, Motivation, multiboot, The Multiboot Standard}. The other goals, listed in approximate order of importance, are: -@itemize +@itemize @bullet{} @item Basic functions must be straightforward for end-users.