texinfo update (Sun Jul 1 11:53:01 EDT 2007)

[Karl Berry]

Index: info/info.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/info.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- info/info.c 26 Feb 2007 22:47:34 -0000      1.16
+++ info/info.c 1 Jul 2007 15:35:46 -0000       1.17
@@ -1,5 +1,5 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.16 2007/02/26 22:47:34 karl Exp $
+   $Id: info.c,v 1.17 2007/07/01 15:35:46 karl Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    2004, 2005, 2007 Free Software Foundation, Inc.
@@ -295,13 +295,11 @@
     {
       printf ("info (GNU %s) %s\n", PACKAGE, VERSION);
       puts ("");
-      printf (_("\
-Copyright (C) %s Free Software Foundation, Inc.\n\
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
-PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the file named COPYING.\n"),
-              "2005", PACKAGE);
+      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"),
+             "2007");
       xexit (0);
     }
 
Index: info/infokey.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infokey.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- info/infokey.c      22 Feb 2007 00:24:20 -0000      1.12
+++ info/infokey.c      1 Jul 2007 15:35:46 -0000       1.13
@@ -1,7 +1,7 @@
 /* infokey.c -- compile ~/.infokey to ~/.info.
-   $Id: infokey.c,v 1.12 2007/02/22 00:24:20 karl Exp $
+   $Id: infokey.c,v 1.13 2007/07/01 15:35:46 karl Exp $
 
-   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005 Free Software
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2007 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -143,13 +143,11 @@
     {
       printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
       puts ("");
-      printf (_("\
-Copyright (C) %s Free Software Foundation, Inc.\n\
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
-PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the file named COPYING.\n"),
-              "2005", PACKAGE);
+      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"),
+             "2007");
       xexit (0);
     }
 
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- makeinfo/makeinfo.c 20 Jun 2007 20:05:42 -0000      1.99
+++ makeinfo/makeinfo.c 1 Jul 2007 15:35:46 -0000       1.100
@@ -1,5 +1,5 @@
 /* makeinfo -- convert Texinfo source into other formats.
-   $Id: makeinfo.c,v 1.99 2007/06/20 20:05:42 karl Exp $
+   $Id: makeinfo.c,v 1.100 2007/07/01 15:35:46 karl Exp $
 
    Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
@@ -787,13 +787,11 @@
         case 'V': /* --version */
           print_version_info ();
           puts ("");
-      printf (_("\
-Copyright (C) %s Free Software Foundation, Inc.\n\
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
-PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the file named COPYING.\n"),
-              "2005", PACKAGE);
+          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"),
+             "2007");
           xexit (0);
           break;
 
Index: util/install-info.c
===================================================================
RCS file: /sources/texinfo/texinfo/util/install-info.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- util/install-info.c 21 May 2007 17:38:00 -0000      1.16
+++ util/install-info.c 1 Jul 2007 15:35:46 -0000       1.17
@@ -1,5 +1,5 @@
 /* install-info -- create Info directory entry(ies) for an Info file.
-   $Id: install-info.c,v 1.16 2007/05/21 17:38:00 karl Exp $
+   $Id: install-info.c,v 1.17 2007/07/01 15:35:46 karl Exp $
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    2005, 2007 Free Software Foundation, Inc.
@@ -1326,13 +1326,11 @@
         case 'V':
           printf ("install-info (GNU %s) %s\n", PACKAGE, VERSION);
           puts ("");
-      printf (_("\
-Copyright (C) %s Free Software Foundation, Inc.\n\
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
-PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the file named COPYING.\n"),
-              "2005", PACKAGE);
+          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"),
+             "2007");
           xexit (0);
 
         case 'x':
Index: util/texindex.c
===================================================================
RCS file: /sources/texinfo/texinfo/util/texindex.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- util/texindex.c     22 Feb 2007 00:24:19 -0000      1.19
+++ util/texindex.c     1 Jul 2007 15:35:46 -0000       1.20
@@ -1,8 +1,8 @@
 /* texindex -- sort TeX index dribble output into an actual index.
-   $Id: texindex.c,v 1.19 2007/02/22 00:24:19 karl Exp $
+   $Id: texindex.c,v 1.20 2007/07/01 15:35:46 karl Exp $
 
    Copyright (C) 1987, 1991, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -293,13 +293,11 @@
             {
               printf ("texindex (GNU %s) %s\n", PACKAGE, VERSION);
               puts ("");
-      printf (_("\
-Copyright (C) %s Free Software Foundation, Inc.\n\
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
-PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the file named COPYING.\n"),
-              "2005", PACKAGE);
+              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"),
+             "2007");
               xexit (0);
             }
           else if ((strcmp (arg, "--keep") == 0) ||
P info/info.c
P info/infokey.c
P makeinfo/makeinfo.c
P util/install-info.c
P util/texindex.c