From: Bruno Haible <bruno@clisp.org>
Date: Sun, 1 Jul 2007 13:15:59 +0000 (+0000)
Subject: Use the standard --version output.
X-Git-Tag: v0.17~301
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f23e3bcf2c2d8af36bcb380f0df5bd7f6e4c0490;p=thirdparty%2Fgettext.git

Use the standard --version output.
---

diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog
index 1d4426829..5f6f5a2ee 100644
--- a/gettext-runtime/src/ChangeLog
+++ b/gettext-runtime/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-01  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.sh.in (func_version): Use the standard --version output, see
+	<http://lists.gnu.org/archive/html/bug-gnulib/2007-03/msg00302.html>.
+
 2007-06-30  Bruno Haible  <bruno@clisp.org>
 
 	* envsubst.c (main): Use the standard --version output, see
diff --git a/gettext-runtime/src/gettext.sh.in b/gettext-runtime/src/gettext.sh.in
index 4a90e3f67..5c2c10785 100644
--- a/gettext-runtime/src/gettext.sh.in
+++ b/gettext-runtime/src/gettext.sh.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Library General Public License as published
@@ -63,9 +63,10 @@ if test -z "$ZSH_VERSION"; then
       func_version ()
       {
         echo "$progname (GNU $package) $version"
-        echo "Copyright (C) 2003-2005 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."
+        echo "Copyright (C) 2003-2007 Free Software Foundation, Inc.
+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"
       }
       if test $# = 1; then
diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index b9041c065..426534456 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-01  Bruno Haible  <bruno@clisp.org>
+
+	* build-aux/moopp (func_version): Use the standard --version output,
+	see
+	<http://lists.gnu.org/archive/html/bug-gnulib/2007-03/msg00302.html>.
+
 2007-05-13  Bruno Haible  <bruno@clisp.org>
 
 	* m4/vasprintf.m4 (gl_REPLACE_VASPRINTF, gl_PREREQ_VASPRINTF_H): New
diff --git a/gnulib-local/build-aux/moopp b/gnulib-local/build-aux/moopp
index ff68a126f..99b7e4665 100755
--- a/gnulib-local/build-aux/moopp
+++ b/gnulib-local/build-aux/moopp
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Minimal Object-Oriented style PreProcessor.
 
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2006.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -71,9 +71,10 @@ Report bugs to <bruno@clisp.org>."
 func_version ()
 {
   echo "$progname (GNU $package) $version"
-  echo "Copyright (C) 2006 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."
+  echo "Copyright (C) 2006-2007 Free Software Foundation, Inc.
+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"
 }