[SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-84-g9b6e3c0

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=9b6e3c06e836c35480030a13150e9ed2b6a6ee4f

The branch, branch-1.6 has been updated
       via  9b6e3c06e836c35480030a13150e9ed2b6a6ee4f (commit)
       via  f09d509f5c302e37b4a889deed3007c3b55e6a0a (commit)
      from  4e149960673934a405b3dec721b2a1d2e88b2f8d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9b6e3c06e836c35480030a13150e9ed2b6a6ee4f
Author: Eric Blake <address@hidden>
Date:   Mon Jan 5 07:05:17 2009 -0700

    Use nicer email address in web manual.
    
    * maint.mk (web-manual): Use new option in gendocs.sh.
    * m4/gnulib-cache.m4: Regenerate.
    
    Signed-off-by: Eric Blake <address@hidden>
    (cherry picked from commit 307f7138cab1c25928515ac67cc9e41f9cbf96d9)

commit f09d509f5c302e37b4a889deed3007c3b55e6a0a
Author: Eric Blake <address@hidden>
Date:   Mon Jan 5 06:19:40 2009 -0700

    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>
    (cherry picked from commit c677b7503b50d4cf4b8022f23029fff478a2cefb)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |   12 +++++++++++-
 HACKING            |   18 +++++++++---------
 m4/gnulib-cache.m4 |    2 +-
 maint.mk           |   35 ++++++-----------------------------
 4 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d15e52a..41719e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-05  Eric Blake  <address@hidden>
+
+       Use nicer email address in web manual.
+       * maint.mk (web-manual): Use new option in gendocs.sh.
+       * m4/gnulib-cache.m4: Regenerate.
+
+       Nuke xdelta diffs at release time; no one reported using them.
+       * maint.mk (got-xdelta, delta-xdelta): Delete.
+       * HACKING: Likewise.
+
 2008-12-24  Eric Blake  <address@hidden>
 
        Enhance eval, as allowed by POSIX 2008.
@@ -5856,7 +5866,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/HACKING b/HACKING
index fd8cd1e..803913f 100644
--- a/HACKING
+++ b/HACKING
@@ -186,8 +186,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.
 
@@ -221,16 +221,15 @@ 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.  Verify
-  that the files uploaded successfully before sending an announcement.
+  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.  Verify that the files uploaded successfully before
+  sending an announcement.
 
 * Send announcement to address@hidden, address@hidden, and
   address@hidden  If not an alpha send to address@hidden
@@ -262,7 +261,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/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 8b0b99a..49a778d 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
diff --git a/maint.mk b/maint.mk
index d50deec..9c4539e 100644
--- a/maint.mk
+++ b/maint.mk
@@ -1,6 +1,6 @@
 ## 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 +170,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,23 +190,10 @@ 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 ; \
-         $(SHELL) $(abs_srcdir)/build-aux/gendocs.sh $(PACKAGE) \
-           "$(PACKAGE_NAME)- GNU macro processor"
+       @cd '$(srcdir)/doc' ; \
+         $(SHELL) ../build-aux/gendocs.sh -o '$(abs_builddir)/doc/manual' \
+            --email $(PACKAGE_BUGREPORT) $(PACKAGE) \
+           "$(PACKAGE_NAME) - GNU macro processor"
        @echo " *** Upload the doc/manual directory to web-cvs."


hooks/post-receive
--
GNU M4 source repository