Merging upstream version 0.6.

Signed-off-by: Daniel Baumann <daniel@debian.org>

Makefile.in

@@ -65,20 +65,19 @@ info : $(VPATH)/doc/$(progname).info
 $(VPATH)/doc/$(progname).info : $(VPATH)/doc/$(progname).texinfo
 	cd $(VPATH)/doc && makeinfo $(progname).texinfo
 
-man : $(VPATH)/doc/$(progname).1 $(VPATH)/doc/zcat.1 $(VPATH)/doc/zdiff.1 \
-      $(VPATH)/doc/zgrep.1
-
-$(VPATH)/doc/$(progname).1 : $(progname)
-	help2man -o $(VPATH)/doc/$(progname).1 ./$(progname)
+man : $(VPATH)/doc/zcat.1 $(VPATH)/doc/zdiff.1 $(VPATH)/doc/zgrep.1
 
 $(VPATH)/doc/zcat.1 : zcat
-	help2man -o $(VPATH)/doc/zcat.1 --no-info ./zcat
+	help2man -n 'concatenate compressed files to stdout' \
+	  -o $(VPATH)/doc/zcat.1 --no-info ./zcat
 
 $(VPATH)/doc/zdiff.1 : zdiff
-	help2man -o $(VPATH)/doc/zdiff.1 --no-info ./zdiff
+	help2man -n 'compare compressed files' \
+	  -o $(VPATH)/doc/zdiff.1 --no-info ./zdiff
 
 $(VPATH)/doc/zgrep.1 : zgrep
-	help2man -o $(VPATH)/doc/zgrep.1 --no-info ./zgrep
+	help2man -n 'search compressed files for a regular expression' \
+	  -o $(VPATH)/doc/zgrep.1 --no-info ./zgrep
 
 Makefile : $(VPATH)/configure $(VPATH)/Makefile.in
 	./config.status
@@ -103,7 +102,6 @@ install-info :
 
 install-man :
 	if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 ; fi
-	$(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(progname).1
 	$(INSTALL_DATA) $(VPATH)/doc/zcat.1 $(DESTDIR)$(mandir)/man1/zcat.1
 	-rm -f $(DESTDIR)$(mandir)/man1/zcmp.1
 	cd $(DESTDIR)$(mandir)/man1 && ln -s zdiff.1 zcmp.1
@@ -131,7 +129,6 @@ uninstall-info :
 	-rm -f $(DESTDIR)$(infodir)/$(progname).info
 
 uninstall-man :
-	-rm -f $(DESTDIR)$(mandir)/man1/$(progname).1
 	-rm -f $(DESTDIR)$(mandir)/man1/zcat.1
 	-rm -f $(DESTDIR)$(mandir)/man1/zcmp.1
 	-rm -f $(DESTDIR)$(mandir)/man1/zdiff.1