[Emacs-diffs] /srv/bzr/emacs/trunk r105366: Fix copyrights for javascript and python grammars.

[Chong Yidong]

------------------------------------------------------------
revno: 105366
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-07-30 20:11:05 -0400
message:
  Fix copyrights for javascript and python grammars.
  
  Since these grammars were transcribed from the ECMAScript spec (BSD
  licensed) and Python sources (PSL) respectively, the copyright and
  license notices must be included in these files.
modified:
  etc/grammars/javascript-jv.wy
  etc/grammars/python.wy
  lisp/cedet/semantic/bovine/c-by.el
  lisp/cedet/semantic/bovine/make-by.el
  lisp/cedet/semantic/bovine/scm-by.el
  lisp/cedet/semantic/wisent/javat-wy.el
  lisp/cedet/semantic/wisent/js-wy.el
  lisp/cedet/semantic/wisent/python-wy.el

=== modified file 'etc/grammars/javascript-jv.wy'
--- a/etc/grammars/javascript-jv.wy     2011-07-30 02:06:43 +0000
+++ b/etc/grammars/javascript-jv.wy     2011-07-31 00:11:05 +0000
@@ -1,38 +1,61 @@
-;;; semantic/wisent/javascript-jv.wy -- LALR grammar for Javascript
-;;
-;; Copyright (C) 2005 Joakim Verona, Eric Ludlam
-;; JAVE Copyright (C) Alex Walker
-;;
+;;; javascript-jv.wy -- LALR grammar for Javascript
+
+;; Copyright (C) 2005-2011 Free Software Foundation, Inc.
+;; Copyright (C) Ecma International.
+
 ;; Author: Joakim Verona
-;; Maintainer: 
-;; Keywords: syntax
-;;
-;; This file is not part of GNU Emacs.
-;;
-;; 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 software is distributed in the hope that it will be useful,
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs 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.
-;;
+;; 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 GNU Emacs; 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 ;;; Commentary:
-;;
-;;JAVE converted from a bison javascript definition at:
-;;  http://www.soton.net/jssyntaxchecker/FinalReport.pdf
-;;by Alex Walker
-;;and from wisent-javascrypt.wy by Eric Ludlam
-;;
-;;...and then further modified by Joakim Verona
-;;and its more of an experiment than anything useful
+
+;; The grammar itself is transcribed from the ECMAScript Language
+;; Specification published at
+;;
+;; http://www.ecma-international.org/publications/standards/Ecma-262.htm
+;;
+;; and redistributed under the following license:
+
+;; Redistribution and use in source and binary forms, with or without
+;; modification, are permitted provided that the following conditions
+;; are met:
+
+;; 1. Redistributions of source code must retain the above copyright
+;; notice, this list of conditions and the following disclaimer.
+
+;; 2. Redistributions in binary form must reproduce the above
+;; copyright notice, this list of conditions and the following
+;; disclaimer in the documentation and/or other materials provided
+;; with the distribution.
+
+;; 3. Neither the name of the authors nor Ecma International may be
+;; used to endorse or promote products derived from this software
+;; without specific prior written permission.  THIS SOFTWARE IS
+;; PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR
+;; IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+;; ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR
+;; ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+;; OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+;; BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+;; USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+;; DAMAGE.
 
 %package javascript-jv-wy
 ;; JAVE I prefere ecmascript-mode
@@ -500,4 +523,4 @@
   semantic-lex-default-action
   )
 
-;;; semantic/wisent/javascript-jv.wy ends here
+;;; javascript-jv.wy ends here

=== modified file 'etc/grammars/python.wy'
--- a/etc/grammars/python.wy    2011-07-30 21:18:40 +0000
+++ b/etc/grammars/python.wy    2011-07-31 00:11:05 +0000
@@ -1,7 +1,8 @@
 ;;; python.wy -- LALR grammar for Python
 
 ;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
-;;
+;; Copyright (C) 2001-2010 Python Software Foundation
+
 ;; Author: Richard Kim <address@hidden>
 ;; Maintainer: Richard Kim <address@hidden>
 ;; Created: June 2002
@@ -25,8 +26,58 @@
 ;;; Commentary:
 ;;
 ;; This is an LALR python parser that follows the official python
-;; grammar closely with very few exceptions.
-;;
+;; grammar closely with very few exceptions.  The Python grammar is
+;; used and reproduced under the following license:
+;;
+;; PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+;; --------------------------------------------
+;; 1. This LICENSE AGREEMENT is between the Python Software Foundation
+;; ("PSF"), and the Individual or Organization ("Licensee") accessing
+;; and otherwise using this software ("Python") in source or binary
+;; form and its associated documentation.
+;;
+;; 2. Subject to the terms and conditions of this License Agreement,
+;; PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide
+;; license to reproduce, analyze, test, perform and/or display
+;; publicly, prepare derivative works, distribute, and otherwise use
+;; Python alone or in any derivative version, provided, however, that
+;; PSF's License Agreement and PSF's notice of copyright, i.e.,
+;; "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010 Python Software Foundation; All Rights Reserved" are
+;; retained in Python alone or in any derivative version prepared by
+;; Licensee.
+;;
+;; 3. In the event Licensee prepares a derivative work that is based
+;; on or incorporates Python or any part thereof, and wants to make
+;; the derivative work available to others as provided herein, then
+;; Licensee hereby agrees to include in any such work a brief summary
+;; of the changes made to Python.
+;;
+;; 4. PSF is making Python available to Licensee on an "AS IS"
+;; basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+;; IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+;; DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+;; FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+;; INFRINGE ANY THIRD PARTY RIGHTS.
+;;
+;; 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+;; FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
+;; RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR
+;; ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+;;
+;; 6. This License Agreement will automatically terminate upon a
+;; material breach of its terms and conditions.
+;;
+;; 7. Nothing in this License Agreement shall be deemed to create any
+;; relationship of agency, partnership, or joint venture between PSF
+;; and Licensee.  This License Agreement does not grant permission to
+;; use PSF trademarks or trade name in a trademark sense to endorse or
+;; promote products or services of Licensee, or any third party.
+;;
+;; 8. By copying, installing or otherwise using Python, Licensee
+;; agrees to be bound by the terms and conditions of this License
+;; Agreement.
+
 ;;; To do:
 ;;
 ;; * Verify that semantic-lex-python-number regexp is correct.

=== modified file 'lisp/cedet/semantic/bovine/c-by.el'
--- a/lisp/cedet/semantic/bovine/c-by.el        2011-01-25 04:08:28 +0000
+++ b/lisp/cedet/semantic/bovine/c-by.el        2011-07-31 00:11:05 +0000
@@ -19,8 +19,7 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from the grammar file semantic/bovine/c.by
-;; in the CEDET repository.
+;; This file was generated from etc/grammars/c.by.
 
 ;;; Code:
 

=== modified file 'lisp/cedet/semantic/bovine/make-by.el'
--- a/lisp/cedet/semantic/bovine/make-by.el     2011-01-26 08:36:39 +0000
+++ b/lisp/cedet/semantic/bovine/make-by.el     2011-07-31 00:11:05 +0000
@@ -19,8 +19,7 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from the grammar file
-;; semantic/bovine/make.by in the CEDET repository.
+;; This file was generated from etc/grammars/make.by.
 
 ;;; Code:
 

=== modified file 'lisp/cedet/semantic/bovine/scm-by.el'
--- a/lisp/cedet/semantic/bovine/scm-by.el      2011-01-25 04:08:28 +0000
+++ b/lisp/cedet/semantic/bovine/scm-by.el      2011-07-31 00:11:05 +0000
@@ -19,8 +19,7 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from the grammar file
-;; semantic/bovine/scm.by in the CEDET repository.
+;; This file was generated from etc/grammars/scm.by.
 
 ;;; Code:
 

=== modified file 'lisp/cedet/semantic/wisent/javat-wy.el'
--- a/lisp/cedet/semantic/wisent/javat-wy.el    2011-01-25 04:08:28 +0000
+++ b/lisp/cedet/semantic/wisent/javat-wy.el    2011-07-31 00:11:05 +0000
@@ -19,8 +19,7 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from the grammar file
-;; semantic/wisent/wisent-java-tags.wy in the CEDET repository.
+;; This file was generated from etc/java-tags.wy.
 
 ;;; Code:
 

=== modified file 'lisp/cedet/semantic/wisent/js-wy.el'
--- a/lisp/cedet/semantic/wisent/js-wy.el       2011-01-25 04:08:28 +0000
+++ b/lisp/cedet/semantic/wisent/js-wy.el       2011-07-31 00:11:05 +0000
@@ -1,6 +1,7 @@
 ;;; semantic/wisent/js-wy.el --- Generated parser support file
 
 ;; Copyright (C) 2005, 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) Ecma International.
 
 ;; This file is part of GNU Emacs.
 
@@ -19,8 +20,7 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from the grammar file
-;; semantic/wisent/wisent-javascript-jv.wy in the CEDET repository.
+;; This file was generated from etc/grammars/javascript-jv.wy.
 
 ;;; Code:
 (require 'semantic/lex)

=== modified file 'lisp/cedet/semantic/wisent/python-wy.el'
--- a/lisp/cedet/semantic/wisent/python-wy.el   2011-01-26 08:36:39 +0000
+++ b/lisp/cedet/semantic/wisent/python-wy.el   2011-07-31 00:11:05 +0000
@@ -1,6 +1,7 @@
 ;;; semantic/wisent/python-wy.el --- Generated parser support file
 
 ;; Copyright (C) 2002-2004, 2007, 2010-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2001-2010 Python Software Foundation
 
 ;; This file is part of GNU Emacs.
 
@@ -19,8 +20,7 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from the grammar file
-;; semantic/wisent/wisent-python.wy in the CEDET repository.
+;; This file was generated from etc/grammars/python.wy.
 
 ;;; Code: