[SCM] GNU gss branch, master, updated. gss-0-1-1-29-g701c3a2

[Simon Josefsson]

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

http://git.savannah.gnu.org/cgit/gss.git/commit/?id=701c3a24f90990fa0551998d6c9719c30c971518

The branch, master has been updated
       via  701c3a24f90990fa0551998d6c9719c30c971518 (commit)
       via  bc8b85a8b271771dcb6a681d978a6504944bc696 (commit)
      from  593b792392bdb9eaf677b93f83fd265988be3ee8 (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 701c3a24f90990fa0551998d6c9719c30c971518
Author: Simon Josefsson <address@hidden>
Date:   Tue Jan 19 00:47:47 2010 +0100

    Update gnulib files.

commit bc8b85a8b271771dcb6a681d978a6504944bc696
Author: Simon Josefsson <address@hidden>
Date:   Tue Jan 19 00:47:27 2010 +0100

    Bump copyright year.

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

Summary of changes:
 cfg.mk             |    2 +-
 doc/Makefile.am    |    4 ++--
 lib/gl/Makefile.am |    6 +++---
 maint.mk           |    9 ++++++---
 src/gl/Makefile.am |    6 +++---
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index c9e5cd3..7969fdd 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -28,7 +28,7 @@ endif
 local-checks-to-skip = sc_copyright_check sc_immutable_NEWS            \
        sc_makefile_at_at_check sc_prohibit_strcmp sc_require_config_h  \
        sc_require_config_h_first
-VC_LIST_NEVER = ^((lib/|src/)?(gl|gltests|build-aux))/.*
+VC_LIST_ALWAYS_EXCLUDE_REGEX = ^((lib/|src/)?(gl|gltests|build-aux))/.*
 
 gtk-doc.make:
        gtkdocize
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 41c033a..2f6eb47 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon Josefsson
 #
 # This file is part of the Generic Security Service (GSS).
 #
@@ -46,6 +46,6 @@ GDOC_TEXI_PREFIX = texi/
 GDOC_MAN_PREFIX = man/
 GDOC_MAN_EXTRA_ARGS = -module $(PACKAGE) -sourceversion $(VERSION) \
        -bugsto $(PACKAGE_BUGREPORT) -includefuncprefix -seeinfo $(PACKAGE) \
-       -copyright "2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson" \
+       -copyright "2003-2010 Simon Josefsson" \
        -verbatimcopying -pkg-name "$(PACKAGE_NAME)"
 include $(srcdir)/Makefile.gdoci
diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am
index 3de6544..1b5ef15 100644
--- a/lib/gl/Makefile.am
+++ b/lib/gl/Makefile.am
@@ -160,7 +160,8 @@ string.h: string.in.h $(LINK_WARNING_H) $(ARG_NONNULL_H)
              -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
              -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
              -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \
-             -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
+             < $(srcdir)/string.in.h | \
+         sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
              -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
              -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
              -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
@@ -189,8 +190,7 @@ string.h: string.in.h $(LINK_WARNING_H) $(ARG_NONNULL_H)
              -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \
              -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             < $(srcdir)/string.in.h; \
+             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)'; \
        } > address@hidden && \
        mv address@hidden $@
 MOSTLYCLEANFILES += string.h string.h-t
diff --git a/maint.mk b/maint.mk
index c91b730..366d12a 100644
--- a/maint.mk
+++ b/maint.mk
@@ -36,11 +36,14 @@ VC-tag = git tag -s -m '$(VERSION)' -u '$(gpg_key_ID)'
 
 VC_LIST = $(build_aux)/vc-list-files -C $(srcdir)
 
+# You can override this variable in cfg.mk to set your own regexp
+# matching files to ignore.
+VC_LIST_ALWAYS_EXCLUDE_REGEX ?= ^$$
+
 VC_LIST_EXCEPT = \
   $(VC_LIST) | if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \
-              else grep -Ev "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi \
-       | if test -n "$(VC_LIST_NEVER)"; then grep -Ev "$(VC_LIST_NEVER)"; \
-       else cat; fi
+              else grep -Ev -e "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi \
+       | grep -Ev -e '$(VC_LIST_ALWAYS_EXCLUDE_REGEX)'
 
 ifeq ($(origin prev_version_file), undefined)
   prev_version_file = $(srcdir)/.prev-version
diff --git a/src/gl/Makefile.am b/src/gl/Makefile.am
index b2b4258..d72c07f 100644
--- a/src/gl/Makefile.am
+++ b/src/gl/Makefile.am
@@ -219,7 +219,8 @@ unistd.h: unistd.in.h $(LINK_WARNING_H) $(WARN_ON_USE_H) 
$(ARG_NONNULL_H)
              -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \
              -e 's|@''GNULIB_USLEEP''@|$(GNULIB_USLEEP)|g' \
              -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
-             -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
+             < $(srcdir)/unistd.in.h | \
+         sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
              -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
              -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
              -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
@@ -276,8 +277,7 @@ unistd.h: unistd.in.h $(LINK_WARNING_H) $(WARN_ON_USE_H) 
$(ARG_NONNULL_H)
              -e 
's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g'
 \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/unistd.in.h; \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
        } > address@hidden && \
        mv address@hidden $@
 MOSTLYCLEANFILES += unistd.h unistd.h-t


hooks/post-receive
-- 
GNU gss