[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.5-233-g1321a36

[Ludovic Courtès]

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 Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=1321a36ed61deb9431b41768dc92cb7230c9afa1

The branch, stable-2.0 has been updated
       via  1321a36ed61deb9431b41768dc92cb7230c9afa1 (commit)
       via  d7a33b64598fb1869832fae7220b1e23811ab567 (commit)
       via  5e3f05fcd2dbb8692a2857d615c77f9d9f2cfac5 (commit)
       via  7e0ee59c601388e89d3d51ff9986290955ea9945 (commit)
      from  ad4eb036dc02de47615dcbb392eb29109c916eaf (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 1321a36ed61deb9431b41768dc92cb7230c9afa1
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jul 7 11:41:39 2012 +0200

    build: Use `AM_PROG_AR'.
    
    * configure.ac: Use `AM_PROG_AR', as suggested by Automake
      1.12.1 ("warning: 'address@hidden@.la':
      linking libtool libraries using a non-POSIX archiver requires
      'AM_PROG_AR' in 'configure.ac'").

commit d7a33b64598fb1869832fae7220b1e23811ab567
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jul 7 11:32:38 2012 +0200

    Fix typos in `NEWS'.
    
    * NEWS: Fix typos.

commit 5e3f05fcd2dbb8692a2857d615c77f9d9f2cfac5
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jul 7 11:29:38 2012 +0200

    Bump version number for 2.0.6.
    
    * GUILE-VERSION (GUILE_MICRO_VERSION): Increment.
      (LIBGUILE_INTERFACE_CURRENT): Increment, to account for new C
      functions like `scm_c_nvalues', `scm_to_pointer', etc.
      (LIBGUILE_INTERFACE_AGE): Increment.

commit 7e0ee59c601388e89d3d51ff9986290955ea9945
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jul 7 11:10:49 2012 +0200

    Store the `git-version-gen' patch.
    
    * gnulib-local/build-aux/git-version-gen.diff: New file.
    * Makefile.am (EXTRA_DIST): Add it.

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

Summary of changes:
 GUILE-VERSION                               |    6 +-
 Makefile.am                                 |   19 ++++----
 NEWS                                        |    8 ++--
 configure.ac                                |    1 +
 gnulib-local/build-aux/git-version-gen.diff |   62 +++++++++++++++++++++++++++
 5 files changed, 80 insertions(+), 16 deletions(-)
 create mode 100644 gnulib-local/build-aux/git-version-gen.diff

diff --git a/GUILE-VERSION b/GUILE-VERSION
index 2d73c5b..b31fa72 100644
--- a/GUILE-VERSION
+++ b/GUILE-VERSION
@@ -3,7 +3,7 @@
 # Note: `GUILE_VERSION' is defined in `configure.ac' using `git-version-gen'.
 GUILE_MAJOR_VERSION=2
 GUILE_MINOR_VERSION=0
-GUILE_MICRO_VERSION=5
+GUILE_MICRO_VERSION=6
 
 GUILE_EFFECTIVE_VERSION=2.0
 
@@ -18,7 +18,7 @@ GUILE_EFFECTIVE_VERSION=2.0
 # See libtool info pages for more information on how and when to
 # change these.
 
-LIBGUILE_INTERFACE_CURRENT=26
+LIBGUILE_INTERFACE_CURRENT=27
 LIBGUILE_INTERFACE_REVISION=0
-LIBGUILE_INTERFACE_AGE=4
+LIBGUILE_INTERFACE_AGE=5
 
LIBGUILE_INTERFACE="${LIBGUILE_INTERFACE_CURRENT}:${LIBGUILE_INTERFACE_REVISION}:${LIBGUILE_INTERFACE_AGE}"
diff --git a/Makefile.am b/Makefile.am
index 807e0a8..446bb3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,15 +42,16 @@ SUBDIRS =                                   \
 libguileincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)
 libguileinclude_HEADERS = libguile.h
 
-EXTRA_DIST = LICENSE HACKING GUILE-VERSION             \
-            m4/ChangeLog-2008                          \
-            m4/gnulib-cache.m4                         \
-            ChangeLog-2008                             \
-            .version                                   \
-            gnulib-local/lib/localcharset.h.diff       \
-            gnulib-local/lib/localcharset.c.diff       \
-            gnulib-local/m4/clock_time.m4.diff         \
-            gnulib-local/m4/canonicalize.m4.diff
+EXTRA_DIST = LICENSE HACKING GUILE-VERSION                     \
+            m4/ChangeLog-2008                                  \
+            m4/gnulib-cache.m4                                 \
+            ChangeLog-2008                                     \
+            .version                                           \
+            gnulib-local/lib/localcharset.h.diff               \
+            gnulib-local/lib/localcharset.c.diff               \
+            gnulib-local/m4/clock_time.m4.diff                 \
+            gnulib-local/m4/canonicalize.m4.diff               \
+            gnulib-local/build-aux/git-version-gen.diff
 
 TESTS = check-guile
 TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
diff --git a/NEWS b/NEWS
index 1225206..64d374d 100644
--- a/NEWS
+++ b/NEWS
@@ -18,7 +18,7 @@ common subexpressions with their boolean values (potentially 
enabling
 dead code elimination), equivalent bound lexicals, or it can elide them
 entirely, depending on the context in which they are executed.  This
 pass is especially useful in removing duplicate type checks, such as
-those produced by SRFi-9 record accessors.
+those produced by SRFI-9 record accessors.
 
 ** Improvements to the partial evaluator
 
@@ -50,8 +50,8 @@ reader will record source information for more kinds of 
datums.
 
 ** Improved error and warning messages
 
-`syntax-violation' errors now prefer 'subform' for source info, with
-'form' as fallback.  Syntactic errors in `cond' and `case' now produce
+`syntax-violation' errors now prefer `subform' for source info, with
+`form' as fallback.  Syntactic errors in `cond' and `case' now produce
 better errors.  `case' can now warn on duplicate datums, or datums that
 cannot be usefully compared with `eqv?'.  `-Warity-mismatch' now handles
 applicable structs.  `-Wformat' is more robust in the presence of
@@ -61,7 +61,7 @@ define appropriate exception printers.
 ** A few important bug fixes in the HTTP modules.
 
 Guile's web server framework now checks if an application returns a body
-wheree it is not permitted, for example in response to a HEAD request,
+where it is not permitted, for example in response to a HEAD request,
 and warn or truncate the response as appropriate.  Bad requests now
 cause a 400 Bad Request response to be printed before closing the port.
 Finally, some date-printing and URL-parsing bugs were fixed.
diff --git a/configure.ac b/configure.ac
index af7c3a8..32a6760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,7 @@ AC_PROG_CPP
 AC_PROG_SED
 AC_PROG_AWK
 AC_PROG_LN_S
+AM_PROG_AR
 
 dnl Gnulib.
 gl_INIT
diff --git a/gnulib-local/build-aux/git-version-gen.diff 
b/gnulib-local/build-aux/git-version-gen.diff
new file mode 100644
index 0000000..c222a99
--- /dev/null
+++ b/gnulib-local/build-aux/git-version-gen.diff
@@ -0,0 +1,62 @@
+This patch is being discussed
+at <http://lists.gnu.org/archive/html/bug-gnulib/2012-07/msg00079.html>.
+Remove when integrated in Gnulib.
+
+--- a/build-aux/git-version-gen        2012-06-12 21:25:48.000000000 +0200
++++ b/build-aux/git-version-gen        2012-07-07 01:52:08.000000000 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # Print a version string.
+-scriptversion=2012-03-18.17; # UTC
++scriptversion=2012-07-06.14; # UTC
+ 
+ # Copyright (C) 2007-2012 Free Software Foundation, Inc.
+ #
+@@ -85,20 +85,25 @@
+ 
+ Options:
+ 
+-   --prefix           prefix of git tags (default 'v')
++   --prefix     prefix of git tags to strip from version (default 'v')
++   --match      pattern for git tags to match (default: '\$prefix*')
+ 
+-   --help             display this help and exit
+-   --version          output version information and exit
++   --help       display this help and exit
++   --version    output version information and exit
+ 
+-Running without arguments will suffice in most cases."
++Running without arguments will suffice in most cases.  If no --match
++argument is given, only match tags that begin with the --prefix."
+ 
+ prefix=v
++unset match
++unset tag_sed_script
+ 
+ while test $# -gt 0; do
+   case $1 in
+     --help) echo "$usage"; exit 0;;
+     --version) echo "$version"; exit 0;;
+     --prefix) shift; prefix="$1";;
++    --match) shift; match="$1";;
+     -*)
+       echo "$0: Unknown option '$1'." >&2
+       echo "$0: Try '--help' for more information." >&2
+@@ -121,6 +126,7 @@
+     exit 1
+ fi
+ 
++match="${match:-$prefix*}"
+ tag_sed_script="${tag_sed_script:-s/x/x/}"
+ 
+ nl='
+@@ -151,8 +157,7 @@
+ # directory, and "git describe" output looks sensible, use that to
+ # derive a version string.
+ elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
+-    && v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \
+-          || git describe --abbrev=4 HEAD 2>/dev/null` \
++    && v=`git describe --abbrev=4 --match="$match" HEAD 2>/dev/null` \
+     && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
+     && case $v in
+          $prefix[0-9]*) ;;


hooks/post-receive
-- 
GNU Guile