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

[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=d7879f327c28e6a206aa93d009e27224cf6b4b16

The branch, branch-1.6 has been updated
       via  d7879f327c28e6a206aa93d009e27224cf6b4b16 (commit)
       via  f2d83a031ed53ac5ab28b3f23d06b8ea7b74fdf6 (commit)
      from  025163f3e3eedf665c3baf41e49c501a03a87bf4 (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 d7879f327c28e6a206aa93d009e27224cf6b4b16
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Feb 27 22:48:55 2010 +0100

    Support bootstrap --gnulib-srcdir=DIR.
    
    I saw `bootstrap' doesn't accept --gnulib-srcdir as it is already done
    by other projects using gnulib.  It doesn't add a new feature as it can
    be already done specifying GNULIB_SRCDIR, it just make the script more
    similar to scripts used by other projects doing a bootstrap from
    gnulib.
    
    * bootstrap: Add --gnulib-srcdir option, which overrides
    GNULIB_SRCDIR, for consistency with gnulib bootstrap.
    
    Signed-off-by: Eric Blake <address@hidden>

commit f2d83a031ed53ac5ab28b3f23d06b8ea7b74fdf6
Author: Eric Blake <address@hidden>
Date:   Mon Mar 1 09:30:41 2010 -0700

    Mention release of version 1.4.14.
    
    * gnulib: Update to latest.
    * README: Drop CVS mention.
    * HACKING: Tweak release instructions.
    * NEWS: Mention the release.
    * .prev-version: Record previous version.
    * cfg.mk (old_NEWS_hash): Auto-update.
    
    Signed-off-by: Eric Blake <address@hidden>
    (cherry picked from commit a90f35d7c17b51e8afea9f6d7e2daddeff135c9d)

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

Summary of changes:
 .prev-version |    2 +-
 ChangeLog     |   16 ++++++++++++++++
 HACKING       |   14 +++++++-------
 NEWS          |    2 +-
 README        |    4 ++--
 bootstrap     |   10 +++++++++-
 cfg.mk        |    2 +-
 gnulib        |    2 +-
 8 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/.prev-version b/.prev-version
index acd81d7..323afbc 100644
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-1.4.13
+1.4.14
diff --git a/ChangeLog b/ChangeLog
index 98869b2..65ad900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-03-02  Giuseppe Scrivano  <address@hidden>  (tiny change)
+
+       Support bootstrap --gnulib-srcdir=DIR.
+       * bootstrap: Add --gnulib-srcdir option, which overrides
+       GNULIB_SRCDIR, for consistency with gnulib bootstrap.
+
+2010-03-01  Eric Blake  <address@hidden>
+
+       Mention release of version 1.4.14.
+       * gnulib: Update to latest.
+       * README: Drop CVS mention.
+       * HACKING: Tweak release instructions.
+       * NEWS: Mention the release.
+       * .prev-version: Record previous version.
+       * cfg.mk (old_NEWS_hash): Auto-update.
+
 2010-02-24  Eric Blake  <address@hidden>
 
        Improve parsing example.
diff --git a/HACKING b/HACKING
index c7dec76..d9c940a 100644
--- a/HACKING
+++ b/HACKING
@@ -271,8 +271,8 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny change)
 * Run `git tag -s -m <version> -u <gpg_key> v<version>' with the desired
   version number.  Do not push anything upstream at this point.
 
-* Run `make maintainer-distcheck'.  If there are any problems, fix them,
-  run `git tag -d v<version>' and start again from the `git commit' step.
+* Run `make distcheck'.  If there are any problems, fix them, then run
+  `git tag -d v<version>' and start again from the `git commit' step.
 
 * Run `make <target>', with target set to `stable, `alpha', or `beta' as
   appropriate.  This will run various additional checks and create diff
@@ -303,7 +303,7 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny change)
   to push the release tag and complete the release.
 
 * For stable releases, update the webpages.
-  Run`build-aux/gnu-web-doc-update', which runs `make web-manual' on a
+  Run `build-aux/gnu-web-doc-update', which runs `make web-manual' on a
   temporary git branch corresponding to the release, then copies the
   contents of doc/manual into a CVS checkout of the M4 manual
   repository.  Follow up with any needed edits to m4.html, using:
@@ -312,10 +312,10 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny 
change)
 
 * Post a news blurb on https://savannah.gnu.org/projects/m4.
 
-* Update the Free Software Directory.  Checkout the CVS sources:
-    cvs -d :pserver:address@hidden:/sources/directory \
-      co directory/m4.txt
-  After making edits, mail the diff to <address@hidden>.
+* Update the Free Software Directory.  Browse to:
+    http://directory.fsf.org/project/m4/
+  and send an email to <address@hidden> mentioning any content
+  that needs to be updated.
 
 -----------
 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
diff --git a/NEWS b/NEWS
index 7039e31..7a101c8 100644
--- a/NEWS
+++ b/NEWS
@@ -147,7 +147,7 @@ contains the following beta features that were deemed worth 
deferring until
 
 ** A number of portability improvements inherited from gnulib.
 
-* Noteworthy changes in Version 1.4.14 (2010-??-??) [stable]
+* Noteworthy changes in Version 1.4.14 (2010-02-24) [stable]
   Released by Eric Blake, based on git version 1.4.13.*
 
 ** Fix regression introduced in 1.4.12 where executing with stdout closed
diff --git a/README b/README
index fc25537..9a80548 100644
--- a/README
+++ b/README
@@ -16,8 +16,8 @@ process requires that you first install a released copy of 
GNU `m4'.
 If you are just trying to build `m4' from a released tarball, you
 should not normally need to run `./bootstrap' or `autoreconf'; just go
 ahead and start with `./configure'.  If you are trying to build `m4'
-from git or CVS, more information can be found in the file HACKING,
-only found in a version control checkout.
+from git, more information can be found in the version-control-only
+file HACKING.
 
 In the subdirectory `examples' you will find various m4 files, ranging
 from trivial test files to rather advanced macros.  If you intend to
diff --git a/bootstrap b/bootstrap
index 058eb1c..2b2c044 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2010-01-05
+# bootstrap (GNU M4) version 2010-03-02
 # Written by Gary V. Vaughan  <address@hidden>
 
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
@@ -24,6 +24,12 @@
 # Usage: $progname [options]
 
 # -f      --force            bootstrap even when sources are not from git
+#         --gnulib-srcdir=DIRNAME
+#                            Specify the local directory where gnulib
+#                            sources reside.  Use this if you already
+#                            have gnulib sources on your machine, and
+#                            do not want to waste your bandwidth downloading
+#                            them again.  Defaults to $GNULIB_SRCDIR.
 # -v      --version          print version information
 # -h,-?   --help             print short or long help message
 
@@ -190,6 +196,8 @@ func_update ()
     case $opt in
       # Separate optargs to short options:
       -f|--force)       vcs_only_file=                                  ;;
+      --gnulib-srcdir=*)
+        GNULIB_SRCDIR=`expr "X$opt" : 'X--gnulib-srcdir=\(.*\)'`        ;;
       -\?|-h)           func_usage                                      ;;
       --help)           func_help                                       ;;
       --version)        func_version                                    ;;
diff --git a/cfg.mk b/cfg.mk
index 1d41d29..e9a6074 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -26,7 +26,7 @@ local-checks-to-skip = sc_cast_of_x_alloc_return_value
 config_h_header = "m4\.h"
 
 # Hash of NEWS contents, to ensure we don't add entries to wrong section.
-old_NEWS_hash = cc336e70015e3f8faf575099f18e4129
+old_NEWS_hash = eb4dc25baafabb69ad319dd6b981f37c
 
 # Always use longhand copyrights.
 update-copyright-env = \
diff --git a/gnulib b/gnulib
index 6c53c90..80cd995 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 6c53c9025551ed72e7011f8de83aca2639bc5bfa
+Subproject commit 80cd995cdcbf4b9ded895a43621a11f11806ad8d


hooks/post-receive
-- 
GNU M4 source repository