nobu	2010-04-12 21:47:43 +0900 (Mon, 12 Apr 2010)

  New Revision: 27321

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27321

  Log:
    * LEGAL: separated the section for parse.c.  contributed by Paul
      Betteridge in [ruby-core:29472].

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/LEGAL
    trunk/ChangeLog
    trunk/LEGAL

Index: LEGAL
===================================================================
--- LEGAL	(revision 27320)
+++ LEGAL	(revision 27321)
@@ -70,7 +70,6 @@
 
 tool/config.guess:
 tool/config.sub:
-parse.c:
 
   As long as you distribute these files with the file configure, they
   are covered under the Ruby's license.
@@ -97,6 +96,43 @@
     configuration script generated by Autoconf, you may include it under
     the same distribution terms that you use for the rest of that program.
 
+parse.c:
+
+  This file is licensed under the GPL, but is incorporated into Ruby and 
+  redistributed under the terms of the Ruby license, as permitted by the
+  exception to the GPL below.
+
+     Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+     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
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+
+     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 this program; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.  */
+
+  /* As a special exception, you may create a larger work that contains
+     part or all of the Bison parser skeleton and distribute that work
+     under terms of your choice, so long as that work isn't itself a
+     parser generator using the skeleton or a modified version thereof
+     as a parser skeleton.  Alternatively, if you modify or redistribute
+     the parser skeleton itself, you may (at your option) remove this
+     special exception, which will cause the skeleton and the resulting
+     Bison output files to be licensed under the GNU General Public
+     License without this special exception.
+
+     This special exception was added by the Free Software Foundation in
+     version 2.2 of Bison.  */
+
 util.c (partly):
 
     Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27320)
+++ ChangeLog	(revision 27321)
@@ -1,3 +1,8 @@
+Mon Apr 12 21:47:41 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* LEGAL: separated the section for parse.c.  contributed by Paul
+	  Betteridge in [ruby-core:29472].
+
 Mon Apr 12 09:19:49 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/fileutils.rb (fu_each_src_dest): ensure src is accessible.
Index: ruby_1_8/LEGAL
===================================================================
--- ruby_1_8/LEGAL	(revision 27320)
+++ ruby_1_8/LEGAL	(revision 27321)
@@ -45,7 +45,6 @@
 
 config.guess:
 config.sub:
-parse.c:
 
   As long as you distribute these files with the file configure, they
   are covered under the Ruby's license.
@@ -72,6 +71,43 @@
     configuration script generated by Autoconf, you may include it under
     the same distribution terms that you use for the rest of that program.
 
+parse.c:
+
+  This file is licensed under the GPL, but is incorporated into Ruby and 
+  redistributed under the terms of the Ruby license, as permitted by the
+  exception to the GPL below.
+
+     Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+     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
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+
+     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 this program; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.  */
+
+  /* As a special exception, you may create a larger work that contains
+     part or all of the Bison parser skeleton and distribute that work
+     under terms of your choice, so long as that work isn't itself a
+     parser generator using the skeleton or a modified version thereof
+     as a parser skeleton.  Alternatively, if you modify or redistribute
+     the parser skeleton itself, you may (at your option) remove this
+     special exception, which will cause the skeleton and the resulting
+     Bison output files to be licensed under the GNU General Public
+     License without this special exception.
+
+     This special exception was added by the Free Software Foundation in
+     version 2.2 of Bison.  */
+
 util.c (partly):
 win32/win32.[ch]:
 
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 27320)
+++ ruby_1_8/ChangeLog	(revision 27321)
@@ -1,3 +1,8 @@
+Mon Apr 12 21:47:41 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* LEGAL: separated the section for parse.c.  contributed by Paul
+	  Betteridge in [ruby-core:29472].
+
 Mon Apr 12 12:37:06 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/dl/depend: add -I. for cross compiling.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/