grep branch, master, updated. v2.6.3-86-g24037ee

[Jim Meyering]

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

The branch, master has been updated
       via  24037ee44d0e4c2bb22c31fe9e3747ab13caf22b (commit)
      from  f53baaf7a98c2fbc43eba67a760e62679c53ce50 (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=24037ee44d0e4c2bb22c31fe9e3747ab13caf22b


commit 24037ee44d0e4c2bb22c31fe9e3747ab13caf22b
Author: Jim Meyering <address@hidden>
Date:   Mon Aug 30 10:52:39 2010 +0200

    maint: use gnulib's standard --version-printing code
    
    This includes author names and keeps the copyright year up to date.
    * bootstrap.conf (gnulib_modules): Add propername and version-etc-fsf.
    * src/main.c (AUTHORS): Define.
    (main): Use version_etc, rather than hard-coding the copyright text.
    Prompted by a patch from Paolo Bonzini.

diff --git a/bootstrap.conf b/bootstrap.conf
index 77870fe..8edf429 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -58,6 +58,7 @@ minmax
 obstack
 open
 progname
+propername
 quotearg
 realloc
 regex
@@ -76,6 +77,7 @@ unistd
 unlocked-io
 update-copyright
 useless-if-before-free
+version-etc-fsf
 wchar
 wcrtomb
 wctob
diff --git a/src/main.c b/src/main.c
index 5314912..6f5c4ae 100644
--- a/src/main.c
+++ b/src/main.c
@@ -43,7 +43,9 @@
 #include "intprops.h"
 #include "isdir.h"
 #include "progname.h"
+#include "propername.h"
 #include "savedir.h"
+#include "version-etc.h"
 #include "xalloc.h"
 #include "xstrtol.h"
 
@@ -53,6 +55,10 @@
 
 #define STREQ(a, b) (strcmp (a, b) == 0)
 
+#define AUTHORS \
+  proper_name ("Mike Haertel"), \
+  _("others, see <http://git.sv.gnu.org/cgit/grep.git/tree/AUTHORS>")
+
 struct stats
 {
   struct stats const *parent;
@@ -2156,15 +2162,9 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("%s\n\n", PACKAGE_STRING);
-      printf (_("\
-Copyright (C) %s Free Software Foundation, Inc.\n\
-License GPLv3+: GNU GPL version 3 or later 
<http://gnu.org/licenses/gpl.html>\n\
-This is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law.\n"),
-        "2009");
-      printf ("\n");
-      exit (EXIT_SUCCESS);
+      version_etc (stdout, program_name, PACKAGE_NAME, VERSION, AUTHORS, \
+                   (char *) NULL);                                     \
+      exit (EXIT_SUCCESS);                                             \
     }
 
   if (show_help)

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

Summary of changes:
 bootstrap.conf |    2 ++
 src/main.c     |   18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
grep