Fix missing updates to GPLv3.

Reported by Tys Lefering at
<http://lists.gnu.org/archive/html/bison-patches/2011-04/msg00000.html>.
* src/print-xml.c, src/print-xml.h: In these files.
(cherry picked from commit fea2d6b0975a5b92dfc13b72e2b1d147e8d4a1b6)

diff --git a/ChangeLog b/ChangeLog
index 9f70d4d89ff693e9d96577d3ff9327e1950dc2e3..84bc913685e09fc221d4b3f848ddbdc14a5c7e38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-09  Joel E. Denny  <joeldenny@joeldenny.org>
+
+       Fix missing updates to GPLv3.
+       Reported by Tys Lefering at
+       <http://lists.gnu.org/archive/html/bison-patches/2011-04/msg00000.html>.
+       * src/print-xml.c, src/print-xml.h: In these files.
+
 2011-03-27  Joel E. Denny  <joeldenny@joeldenny.org>
 
        Add -Wconflicts-sr and -Wconflicts-rr.

diff --git a/src/print-xml.c b/src/print-xml.c
index 1dc0268eeed70eb29d7449c71ac3591eb7ead8b0..0aade5315c051bd71084f1d44508b596d57246bd 100644 (file)
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -4,20 +4,18 @@
 
    This file is part of Bison, the GNU Compiler Compiler.
 
-   Bison is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include "system.h"

diff --git a/src/print-xml.h b/src/print-xml.h
index 5285473f58413fad476e5cbfc0209ea142305a66..1f1cb3dbbd9982fa6a33265057d9bb8a171de991 100644 (file)
--- a/src/print-xml.h
+++ b/src/print-xml.h
@@ -4,20 +4,18 @@
 
    This file is part of Bison, the GNU Compiler Compiler.
 
-   Bison is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef PRINT_XML_H_
 # define PRINT_XML_H_