Use the standard --version output.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 635c88ff67fcafa4f8c550b8c7c846f648d13123..74c50bd1d0707238ae25afb5d7417cf61ba08e08 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,25 @@
+2007-06-30  Bruno Haible  <bruno@clisp.org>
+
+       * hostname.c (main): Use the standard --version output, see
+       <http://lists.gnu.org/archive/html/bug-gnulib/2007-03/msg00302.html>.
+       * msgattrib.c (main): Likewise.
+       * msgcat.c (main): Likewise.
+       * msgcmp.c (main): Likewise.
+       * msgcomm.c (main): Likewise.
+       * msgconv.c (main): Likewise.
+       * msgen.c (main): Likewise.
+       * msgexec.c (main): Likewise.
+       * msgfilter.c (main): Likewise.
+       * msgfmt.c (main): Likewise.
+       * msggrep.c (main): Likewise.
+       * msginit.c (main): Likewise.
+       * msgmerge.c (main): Likewise.
+       * msgunfmt.c (main): Likewise.
+       * msguniq.c (main): Likewise.
+       * recode-sr-latin.c (main): Likewise.
+       * urlget.c (main): Likewise.
+       * xgettext.c (main): Likewise.
+
 2007-06-30  Bruno Haible  <bruno@clisp.org>
 
        * lang-table.c (language_table): Fix entry for Javanese.

diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c
index 8ea0ddabe6a26afdca1ee667e6ba37ca8e8ba4a3..d897aa5b60a9fea6a5ca93a7437a08b198c50855 100644 (file)
--- a/gettext-tools/src/hostname.c
+++ b/gettext-tools/src/hostname.c
@@ -177,8 +177,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\
 "),
              "2001-2003, 2006-2007");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));

diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c
index 6a8244e7c6b883553502ce1583e473b2a638aa45..df224886ccaefc6b62276fda2283d111c98ad3e2 100644 (file)
--- a/gettext-tools/src/msgattrib.c
+++ b/gettext-tools/src/msgattrib.c
@@ -324,8 +324,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\
 "),
              "2001-2007");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));

diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c
index 3456f00c9de0384936a34daec1023fd631c3e944..f4f1e3cf6528eece285654b73958349ae5c915f9 100644 (file)
--- a/gettext-tools/src/msgcat.c
+++ b/gettext-tools/src/msgcat.c
@@ -280,8 +280,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\
 "),
              "2001-2007");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));

diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c
index 400dffcce9b7e1d75389d923007e7817ed788eb8..a9096ebce2cc98de4145da89d493f322cacd09a0 100644 (file)
--- a/gettext-tools/src/msgcmp.c
+++ b/gettext-tools/src/msgcmp.c
@@ -160,8 +160,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-1998, 2000-2007");
       printf (_("Written by %s.\n"), proper_name ("Peter Miller"));

diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c
index 7f85b078532cdbe47902b0e0cec89d025c911bca..4eed74adf644b5a5b19417d06168b8c42db83748 100644 (file)
--- a/gettext-tools/src/msgcomm.c
+++ b/gettext-tools/src/msgcomm.c
@@ -267,8 +267,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-1998, 2000-2007");
       printf (_("Written by %s.\n"), proper_name ("Peter Miller"));

diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c
index 2e60c0e651fd6bd2097bb4f87d31baf807d1773f..fed8ef2d0ad4003cd8a36bc858adf9842bc38f1e 100644 (file)
--- a/gettext-tools/src/msgconv.c
+++ b/gettext-tools/src/msgconv.c
@@ -222,8 +222,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\
 "),
              "2001-2007");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));

diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c
index 6c649a4b907a2cc61f5297bee2e993acef7a98a5..eca591f4a6f570ace6229472fe6aa3348802c360 100644 (file)
--- a/gettext-tools/src/msgen.c
+++ b/gettext-tools/src/msgen.c
@@ -210,8 +210,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\
 "),
              "2001-2007");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));

diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c
index f63c381f6c97f929901c129e6e97206d82e22cec..07bc7c85975ae7116e3eee14f3e3faa45c1f4ee5 100644 (file)
--- a/gettext-tools/src/msgexec.c
+++ b/gettext-tools/src/msgexec.c
@@ -177,8 +177,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\
 "),
              "2001-2007");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));

diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c
index 0b64c6b2576e386fbe53021accfe60fe2f92ad5f..e544381073c9d20415bddf2973fda7d14d03554b 100644 (file)
--- a/gettext-tools/src/msgfilter.c
+++ b/gettext-tools/src/msgfilter.c
@@ -279,8 +279,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\
 "),
              "2001-2007");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));

diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index 5dce0c73e6979c7c7b70eb02f9f32225579219f3..b39a02efff79a99cbfd4bcc2e9b4d22b79902f16 100644 (file)
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -363,8 +363,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-1998, 2000-2007");
       printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));

diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c
index 2405dc1f595b828ebd56d6c4ea2a82ea02dc8436..b52abbd6b4d7b49a1f316e4ecaf6f119b7260cdf 100644 (file)
--- a/gettext-tools/src/msggrep.c
+++ b/gettext-tools/src/msggrep.c
@@ -397,8 +397,9 @@ error while reading \"%s\""), optarg);
       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\
 "),
              "2001-2007");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));

diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index 19bb1ec299ed469aab31199813a6df27b6b32389..8d23927599e9430d20fb1c8c232614bdf33bd2dd 100644 (file)
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -256,8 +256,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\
 "),
              "2001-2007");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));

diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 6e1894da6c52e75a6d36a6e2d1aff79170017286..c113dc17f029ac602385259bf6aad443dbda31d2 100644 (file)
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -318,8 +318,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-1998, 2000-2007");
       printf (_("Written by %s.\n"), proper_name ("Peter Miller"));

diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c
index 0437486fdef0781496288d1cae648aa55d5d3101..58627d9bfd980a51b7c76f9df6ce995c86e8b8ff 100644 (file)
--- a/gettext-tools/src/msgunfmt.c
+++ b/gettext-tools/src/msgunfmt.c
@@ -249,8 +249,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-1998, 2000-2007");
       printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));

diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c
index ee4adf669295c63bcd38fb2a155ef79372368b33..c8c01eb1cf5dbc4ab8094faf874d6c0ffcd44cb2 100644 (file)
--- a/gettext-tools/src/msguniq.c
+++ b/gettext-tools/src/msguniq.c
@@ -246,8 +246,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\
 "),
              "2001-2007");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));

diff --git a/gettext-tools/src/recode-sr-latin.c b/gettext-tools/src/recode-sr-latin.c
index 1e82ba0abdbeba88baac130767e64866317399b7..d39bc12880a77ceef309ae76b3757fb46dd8a613 100644 (file)
--- a/gettext-tools/src/recode-sr-latin.c
+++ b/gettext-tools/src/recode-sr-latin.c
@@ -109,8 +109,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\
 "),
              "2006-2007");
       printf (_("Written by %s and %s.\n"),

diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c
index d1e8c9fde30c4c5dfac8cbc2088393141035e3fa..085539f90df8d6436adc7f1a15ed5c6086abf72d 100644 (file)
--- a/gettext-tools/src/urlget.c
+++ b/gettext-tools/src/urlget.c
@@ -129,8 +129,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\
 "),
              "2001-2003, 2005-2007");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 6145990d7125f4ded548f2fc25820aa26fc98cc0..1075d8a2895b7a3288d79b287a85804f8bc3623d 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -507,8 +507,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-1998, 2000-2007");
       printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));