Version 1.20.1 releasedgroff-1_20_1_real

=======================

`gnu.png' isn't needed any more.

* doc/Makefile.in: Don't handle or create `gnu.png'.
Update all affected targets.

* doc/Makefile.sub: Don't handle or create `gnu.png'.
Update alll affected targets.


`gnu.eps' was missing in the tarball.
Problem reported by Patrik Gräser.

(PROCESSEDEXAMPLEFILES): Remove `gnu.eps'.
(MOSTLYCLEANNOTSRCDIRADD): Fix names of info files.
(install_data): Handle `gnu.eps' specially.

* MORE.STUFF: Mention texi2html's troff backend.
Mention http://groff.ffii.org/groff/contrib.

* README: Mention `MORE.STUFF'.

* NEWS, doc/webpage.ms, doc/groff.texinfo: Updated.

5 files changed, 31 insertions, 24 deletions

diff --git a/doc/.cvsignore b/doc/.cvsignore
index 85b2449b..c46b4046 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,7 +1,6 @@
 Makefile
 examples.stamp
 gnu.eps
-gnu.png
 grnexmpl.g
 grnexmpl.ps
 groff.info
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f781eb2b..d8910d87 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -118,15 +118,13 @@ groff.info: groff.texinfo
 
 gnu.eps: gnu.xpm
 	xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | $(pnmtops) -noturn >$@
-gnu.png: gnu.xpm
-	xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtopng >$@
 
 pic.html: pic.ms
 	$(GROFF) -P-p -P-I`basename $< | sed -e 's|.ms$$||'` \
                  -P-D$(imagedir) -P-j`basename $< | sed -e 's|.ms$$||'` \
                  -Thtml -P-V -ms >$@
 
-webpage.html: webpage.ms gnu.png gnu.eps groff.css
+webpage.html: webpage.ms gnu.eps groff.css
 	$(GROFF) -P-j`basename $< | sed -e 's|.ms$$||'` \
                  -P-nrpb -P-I`basename $< | sed -e 's|.ms$$||'` \
                  -P-D$(imagedir) -Thtml -ms >$@
diff --git a/doc/Makefile.sub b/doc/Makefile.sub
index 15666bb5..a688d49d 100644
--- a/doc/Makefile.sub
+++ b/doc/Makefile.sub
@@ -72,8 +72,7 @@ EXAMPLEFILES=\
 
 PROCESSEDEXAMPLEFILES=\
   webpage.ps \
-  grnexmpl.ps \
-  gnu.eps
+  grnexmpl.ps
 
 HTMLEXAMPLEFILES=\
   webpage.html
@@ -104,10 +103,9 @@ MOSTLYCLEANDIRADD=\
 MOSTLYCLEANNOTSRCDIRADD=\
   groff.css \
   grnexmpl.g \
-  groff \
-  groff-* \
-  gnu.eps \
-  gnu.png
+  groff.info \
+  groff-*.info \
+  gnu.eps
 
 .SUFFIXES: .me .ms .ps .html
 
@@ -148,15 +146,12 @@ gnu.eps: gnu.xpm
 	xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | \
           $(pnmtops_nosetpage) -noturn -rle >$@
 
-gnu.png: gnu.xpm
-	xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtopng >$@
-
 pic.html: pic.ms
 	$(GROFF) -P-p -P-I`basename $< | sed -e 's|.ms$$||'` \
                  -P-D$(imagedir) -P-j`basename $< | sed -e 's|.ms$$||'` \
                  -Thtml -P-V -ms >$@
 
-webpage.html: webpage.ms gnu.png groff.css
+webpage.html: webpage.ms gnu.eps groff.css
 	$(GROFF) -P-j`basename $< | sed -e 's|.ms$$||'` \
                  -P-nrpb -P-I`basename $< | sed -e 's|.ms$$||'` \
                  -P-D$(imagedir) -Thtml -ms >$@
@@ -165,13 +160,13 @@ webpage.ps: gnu.eps
 
 grnexmpl.ps: grnexmpl.me grnexmpl.g
 
-distfiles: groff.info gnu.eps gnu.png
+distfiles: groff.info gnu.eps
 
-install_data: groff.info $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
-              $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
-	-test -d $(DESTDIR)$(infodir) || $(mkinstalldirs) $(DESTDIR)$(infodir)
+install_data: groff.info gnu.eps $(DOCFILES) $(PROCESSEDDOCFILES) \
+              $(make_install_html) $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
 # Prefer info files in builddir over srcdir; we test for
 # the existence of `groff.info'.
+	-test -d $(DESTDIR)$(infodir) || $(mkinstalldirs) $(DESTDIR)$(infodir)
 	d=.; \
 	  test -f "groff.info" || d=$(srcdir); \
 	  for p in $$d/groff.info `ls $$d/groff.info*`; do \
@@ -190,8 +185,13 @@ install_data: groff.info $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
 	  rm -f $(DESTDIR)$(docdir)/$$f; \
 	  $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
 	done
+# Prefer gnu.eps in builddir over srcdir.
 	-test -d $(DESTDIR)$(exampledir) \
 	  || $(mkinstalldirs) $(DESTDIR)$(exampledir)
+	d=.; \
+	  test -f "gnu.eps" || d=$(srcdir); \
+	  rm -f $(DESTDIR)$(exampledir)/gnu.eps; \
+	  $(INSTALL_DATA) $$d/gnu.eps $(DESTDIR)$(exampledir)/gnu.eps
 	for f in $(EXAMPLEFILES); do \
 	  rm -f $(DESTDIR)$(exampledir)/$$f; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(exampledir)/$$f; \
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index f2155aba..e0f44a6c 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -24,7 +24,7 @@
 
 
 @copying
-This manual documents GNU @code{troff} version 1.20.
+This manual documents GNU @code{troff} version 1.20.1.
 
 Copyright @copyright{} 1994-2000, 2001, 2002, 2003, 2004, 2005, 2006,
 2007, 2008, 2009
@@ -473,7 +473,7 @@ developing GNU and promoting software freedom.''
 @titlepage
 @title groff
 @subtitle The GNU implementation of @code{troff}
-@subtitle Edition 1.20
+@subtitle Edition 1.20.1
 @subtitle Spring 2009
 @author by Trent A.@tie{}Fisher
 @author and Werner Lemberg (@email{bug-groff@@gnu.org})
@@ -1415,11 +1415,11 @@ directory, and the main tmac directory; the default locations are
 @Example
 /usr/local/lib/groff/site-tmac
 /usr/local/share/groff/site-tmac
-/usr/local/share/groff/1.18.2/tmac
+/usr/local/share/groff/1.20.1/tmac
 @endExample
 
 @noindent
-assuming that the version of @code{groff} is 1.18.2, and the
+assuming that the version of @code{groff} is 1.20.1, and the
 installation prefix was @file{/usr/local}.  It is possible to fine-tune
 those directories during the installation process.
 @end itemize
@@ -1472,11 +1472,11 @@ locations are
 
 @Example
 /usr/local/share/groff/site-font
-/usr/local/share/groff/1.18.2/font
+/usr/local/share/groff/1.20.1/font
 @endExample
 
 @noindent
-assuming that the version of @code{groff} is 1.18.2, and the
+assuming that the version of @code{groff} is 1.20.1, and the
 installation prefix was @file{/usr/local}.  It is possible to fine-tune
 those directories during the installation process.
 @end itemize
diff --git a/doc/webpage.ms b/doc/webpage.ms
index 4de8cf1f..91cbc479 100644
--- a/doc/webpage.ms
+++ b/doc/webpage.ms
@@ -130,6 +130,9 @@ See the file COPYING for copying permission.
 
 The file PROBLEMS describes various problems that have been encountered in
 compiling, installing, and running groff.
+
+The file MORE.STUFF contains information about add-on packages useful for
+groff.
 .
 .SH
 CVS and FTP access
@@ -289,6 +292,13 @@ postings to the corresponding mailing list.
 .
 .
 .SH
+NEWS VERSION 1.20.1
+.LP
+A packaging error made it necessary to publish this release.
+No user-visible changes.
+.
+.
+.SH
 NEWS VERSION 1.20
 .LP
 .SH 2