From: Bruno Haible <bruno@clisp.org>
Date: Sat, 30 Jun 2007 23:01:09 +0000 (+0000)
Subject: Use the standard --version output.
X-Git-Tag: v0.17~302
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c467c69c65a1456740880b1a14c7f10f2422e49d;p=thirdparty%2Fgettext.git

Use the standard --version output.
---

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 0abe3a5ef..138861e82 100644
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-30  Bruno Haible  <bruno@clisp.org>
+
+	* autopoint.in (func_version): Use the standard --version output, see
+	<http://lists.gnu.org/archive/html/bug-gnulib/2007-03/msg00302.html>.
+	* gettexize.in (func_version): Likewise.
+
 2007-06-30  Bruno Haible  <bruno@clisp.org>
 
 	* po-mode.el (po-check-file-header): Use save-restriction.
diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 906c8eb20..dc9181849 100644
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -175,8 +175,9 @@ func_version ()
 {
   echo "$progname (GNU $package) $version"
   echo "Copyright (C) 2002-2007 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law."
   echo "Written by" "Bruno Haible"
 }
 
diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index cd142d507..fccfb1363 100644
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -176,8 +176,9 @@ func_version ()
 {
   echo "$progname (GNU $package) $version"
   echo "Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law."
   echo "Written by" "Ulrich Drepper"
 }
 
diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index be9b023f3..8c820efd6 100644
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-30  Bruno Haible  <bruno@clisp.org>
+
+	* tstgettext.c (main): Use the standard --version output, see
+	<http://lists.gnu.org/archive/html/bug-gnulib/2007-03/msg00302.html>.
+	* tstngettext.c (main): Likewise.
+
 2007-06-25  Bruno Haible  <bruno@clisp.org>
 
 	* xgettext-awk-2: New file.
diff --git a/gettext-tools/tests/tstgettext.c b/gettext-tools/tests/tstgettext.c
index 2f2934501..39fae3cce 100644
--- a/gettext-tools/tests/tstgettext.c
+++ b/gettext-tools/tests/tstgettext.c
@@ -158,8 +158,9 @@ main (int argc, char *argv[])
       printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION);
       /* xgettext: no-wrap */
       printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
-This is free software; see the source for copying conditions.  There is NO\n\
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
+License GPLv2+: GNU GPL version 2 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\
 "),
 	      "1995-1997, 2000-2006");
       printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));
diff --git a/gettext-tools/tests/tstngettext.c b/gettext-tools/tests/tstngettext.c
index f19bc1229..46486db92 100644
--- a/gettext-tools/tests/tstngettext.c
+++ b/gettext-tools/tests/tstngettext.c
@@ -134,8 +134,9 @@ main (int argc, char *argv[])
       printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION);
       /* xgettext: no-wrap */
       printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
-This is free software; see the source for copying conditions.  There is NO\n\
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
+License GPLv2+: GNU GPL version 2 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\
 "),
 	      "1995-1997, 2000-2006");
       printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));