maintainer patches

[Eric Blake]

I'm pushing some maintenance patches, now that:
- it is 2009,
- no one reported using xdelta files, even though the release announcement 
asked for some feedback
- the gendocs.sh script supports a new --email parameter


>From e25118164abaf361b427b2420780afa29de629b1 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Thu, 1 Jan 2009 20:10:08 -0700
Subject: [PATCH] Update copyright year.

* NEWS: M4 1.4.13 will occur in 2009.
* doc/m4.texinfo (History): Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog          |    8 +++++++-
 NEWS               |    6 +++---
 doc/m4.texinfo     |    5 +++--
 m4/gnulib-cache.m4 |    2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7779dd8..3d3bd7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-01  Eric Blake  <address@hidden>
+
+       Update copyright year.
+       * NEWS: M4 1.4.13 will occur in 2009.
+       * doc/m4.texinfo (History): Likewise.
+
 2008-12-24  Eric Blake  <address@hidden>
 
        Prepare for eventual release.
@@ -4635,7 +4641,7 @@ Mon Jan 22 21:08:52 1990  Rene' Seindal (seindal at 
diku.dk)
        End:
 
        Copyright (C) 1990, 1991, 1992, 1993, 1994, 2000, 2001, 2003,
-       2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+       2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
        Copying and distribution of this file, with or without
        modification, are permitted provided the copyright notice
diff --git a/NEWS b/NEWS
index 906601f..5a895bb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
 GNU M4 NEWS - User visible changes.
-Copyright (C) 1992, 1993, 1994, 2004, 2005, 2006, 2007, 2008 Free Software
-Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 2004, 2005, 2006, 2007, 2008, 2009 Free
+Software Foundation, Inc.
 
-* Noteworthy changes in Version 1.4.13 (2008-12-??) [stable]
+* Noteworthy changes in Version 1.4.13 (2009-01-??) [stable]
   Released by Eric Blake, based on git version 1.4.12.*
 
 ** The manual is now distributed under the terms of FDL 1.3.
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index f628493..c09d771 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -44,7 +44,7 @@
 language.
 
 Copyright @copyright{} 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -398,7 +398,8 @@ History
 released 1.4.3 and 1.4.4.  And in 2006, Eric Blake joined the team and
 prepared patches for the release of 1.4.5, 1.4.6, 1.4.7, and 1.4.8.
 More bug fixes were incorporated in 2007, with releases 1.4.9 and
-1.4.10, closing the series with 1.4.11, 1.4.12, and 1.4.13 in 2008.
+1.4.10.  Eric continued with some portability fixes for 1.4.11 and
+1.4.12 in 2008, and 1.4.13 in 2009.
 
 Meanwhile, development has continued on new features for @code{m4}, such
 as dynamic module loading and additional builtins.  When complete,
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 0b43e2a..f20b6c9 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
-- 
1.6.0.4


>From c677b7503b50d4cf4b8022f23029fff478a2cefb Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Fri, 2 Jan 2009 13:25:39 -0700
Subject: [PATCH] Nuke xdelta diffs at release time; no one reported using them.

* maint.mk (got-xdelta, delta-xdelta): Delete.
* HACKING: Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog |    6 ++++++
 HACKING   |   16 ++++++++--------
 maint.mk  |   29 +++--------------------------
 3 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3d3bd7c..dd8c7f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-02  Eric Blake  <address@hidden>
+
+       Nuke xdelta diffs at release time; no one reported using them.
+       * maint.mk (got-xdelta, delta-xdelta): Delete.
+       * HACKING: Likewise.
+
 2009-01-01  Eric Blake  <address@hidden>
 
        Update copyright year.
diff --git a/HACKING b/HACKING
index 6a10d29..eade193 100644
--- a/HACKING
+++ b/HACKING
@@ -193,8 +193,8 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny change)
 
 * Make sure you have wget installed.
 
-* Make sure you have a copy of xdelta installed, and a copy of the previous
-  release tarball in the build directory.
+* Make sure you have a copy of the previous release tarball in the build
+  directory.
 
 * Make sure you have GNU make installed.
 
@@ -228,15 +228,14 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny 
change)
 
 * Run `make <target> PREV_VERSION=maj.min[.mic[alpha]]', with target set
   to `major', `alpha', or `beta' as appropriate.  This will run various
-  additional checks and create diff and xdelta files from the previous
-  version.
+  additional checks and create diff files from the previous version.
 
 * Run './build-aux/gnupload --to [dest].gnu.org:m4 [files]' to create
   detached gpg signature and clear signed directive files, and upload
   the combination to the correct location.  For an alpha release,
-  gnupload will place files in alpha.gnu.org, in /incoming/alpha, and
-  the xdelta file is not strictly necessary.  For a full release,
-  gnupload will place files in ftp.gnu.org, in /incoming/ftp.
+  gnupload will place files in alpha.gnu.org, in /incoming/alpha; for a
+  full release, gnupload will place files in ftp.gnu.org, in
+  /incoming/ftp.
 
 * Send announcement to address@hidden, address@hidden, and
   address@hidden  If not an alpha send to address@hidden
@@ -263,7 +262,8 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny change)
   After making edits, mail the diff to <address@hidden>.
 
 -- 
-Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+Foundation, Inc.
 
 The canonical source of this file is maintained with the
 GNU M4 package.  Report bugs to address@hidden
diff --git a/maint.mk b/maint.mk
index fa55ac3..8b11ab3 100644
--- a/maint.mk
+++ b/maint.mk
@@ -1,6 +1,7 @@
 ## maint.mk -- Makefile rules for m4 maintainers -*-Makefile-*-
 ##
-## Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+## Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+## Foundation
 ##
 ## This file is part of GNU M4.
 ##
@@ -170,18 +171,8 @@ new-tarball:
        if test -f $$ofile; then :; \
        else echo "Cannot make deltas without $$ofile"; exit 1; fi
 
-.PHONY: got-xdelta
-got-xdelta:
-## Make sure xdelta exists;
-       @if ($(XDELTA) --version 2>&1 | grep version)>/dev/null 2>/dev/null; \
-       then :;\
-       else \
-         echo "Get xdelta from http://sourceforge.net/projects/xdelta.";; \
-         exit 1; \
-       fi
-
 .PHONY: deltas
-deltas: delta-diff delta-xdelta
+deltas: delta-diff
 
 DIFF = diff
 DIFF_OPTIONS = -ruNp
@@ -200,20 +191,6 @@ delta-diff: prev-tarball new-tarball
                | GZIP=$(GZIP_ENV) gzip -c > $$ofile
        rm -rf delta-diff
 
-XDELTA = xdelta
-XDELTA_OPTIONS = -9
-
-.PHONY: delta-xdelta
-delta-xdelta: prev-tarball new-tarball got-xdelta
-## Generate the delta file (xdelta has weird exit statuses, so we need to
-## add some shell code to keep make happy), and then generate the signatures
-## for FSF ftp-upload:
-       ofile="$(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta"; \
-       ( test -z `$(XDELTA) delta $(XDELTA_OPTIONS) \
-           $(PACKAGE)-$(PREV_VERSION).tar.gz $(PACKAGE)-$(VERSION).tar.gz \
-           $$ofile 2>&1` \
-         && : )
-
 .PHONY: web-manual
 web-manual:
        @cd ./doc ; \
-- 
1.6.0.4


>From 307f7138cab1c25928515ac67cc9e41f9cbf96d9 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Fri, 2 Jan 2009 13:36:35 -0700
Subject: [PATCH] Use nicer email address in web manual.

* maint.mk (web-manual): Use new option in gendocs.sh.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog |    3 +++
 maint.mk  |    5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dd8c7f5..2a66325 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-01-02  Eric Blake  <address@hidden>
 
+       Use nicer email address in web manual.
+       * maint.mk (web-manual): Use new option in gendocs.sh.
+
        Nuke xdelta diffs at release time; no one reported using them.
        * maint.mk (got-xdelta, delta-xdelta): Delete.
        * HACKING: Likewise.
diff --git a/maint.mk b/maint.mk
index 8b11ab3..e036105 100644
--- a/maint.mk
+++ b/maint.mk
@@ -194,6 +194,7 @@ delta-diff: prev-tarball new-tarball
 .PHONY: web-manual
 web-manual:
        @cd ./doc ; \
-         $(SHELL) $(srcdir)/build-aux/gendocs.sh $(PACKAGE) \
-           "GNU $(PACKAGE)- GNU macro processor"
+         $(SHELL) $(abs_srcdir)/build-aux/gendocs.sh \
+           --email $(PACKAGE_BUGREPORT) $(PACKAGE) \
+           "$(PACKAGE_NAME) - GNU macro processor"
        @echo " *** Upload the doc/manual directory to web-cvs."
-- 
1.6.0.4