[Emacs-diffs] /srv/bzr/emacs/trunk r106779: Copyright, license, and header fixes for Org.

[Glenn Morris]

------------------------------------------------------------
revno: 106779
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-01-05 00:00:08 -0800
message:
  Copyright, license, and header fixes for Org.
modified:
  lisp/org/ob-calc.el
  lisp/org/ob-emacs-lisp.el
  lisp/org/ob-fortran.el
  lisp/org/ob-js.el
  lisp/org/ob-perl.el
  lisp/org/ob-picolisp.el
  lisp/org/ob-python.el
  lisp/org/ob-ruby.el
  lisp/org/ob-scheme.el
  lisp/org/ob-screen.el
  lisp/org/ob-shen.el
  lisp/org/ob-sqlite.el
  lisp/org/org-eshell.el
  lisp/org/org-lparse.el
  lisp/org/org-mouse.el
  lisp/org/org-odt.el

=== modified file 'lisp/org/ob-calc.el'
--- a/lisp/org/ob-calc.el       2012-01-04 14:49:41 +0000
+++ b/lisp/org/ob-calc.el       2012-01-05 08:00:08 +0000
@@ -1,6 +1,6 @@
 ;;; ob-calc.el --- org-babel functions for calc code evaluation
 
-;; Copyright (C) 2010-2012  Free Software Foundation, Inc
+;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research

=== modified file 'lisp/org/ob-emacs-lisp.el'
--- a/lisp/org/ob-emacs-lisp.el 2012-01-04 14:14:29 +0000
+++ b/lisp/org/ob-emacs-lisp.el 2012-01-05 08:00:08 +0000
@@ -1,6 +1,6 @@
 ;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc
+;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research

=== modified file 'lisp/org/ob-fortran.el'
--- a/lisp/org/ob-fortran.el    2012-01-04 15:13:14 +0000
+++ b/lisp/org/ob-fortran.el    2012-01-05 08:00:08 +0000
@@ -1,30 +1,32 @@
 ;;; ob-fortran.el --- org-babel functions for fortran
 
-;; Copyright (C) 2011-2012 Sergey Litvinov, Eric Schulte
+;; Copyright (C) 2011-2012  Free Software Foundation, Inc.
 
-;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte
+;; Authors: Sergey Litvinov
+;;         Eric Schulte
 ;; Keywords: literate programming, reproducible research, fortran
 ;; Homepage: http://orgmode.org
 ;; Version: 7.8.02
 
-;; This program is free software; you can redistribute it and/or modify
+;; 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, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; 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.
-;;
+
 ;; 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:
 
 ;; Org-Babel support for evaluating fortran code.
+;; Based on ob-C.el by Eric Schulte.
 
 ;;; Code:
 (require 'ob)

=== modified file 'lisp/org/ob-js.el'
--- a/lisp/org/ob-js.el 2012-01-04 14:14:29 +0000
+++ b/lisp/org/ob-js.el 2012-01-05 08:00:08 +0000
@@ -1,6 +1,6 @@
 ;;; ob-js.el --- org-babel functions for Javascript
 
-;; Copyright (C) 2010-2012 Free Software Foundation
+;; Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, js

=== modified file 'lisp/org/ob-perl.el'
--- a/lisp/org/ob-perl.el       2012-01-04 14:14:29 +0000
+++ b/lisp/org/ob-perl.el       2012-01-05 08:00:08 +0000
@@ -1,6 +1,6 @@
 ;;; ob-perl.el --- org-babel functions for perl evaluation
 
-;; Copyright (C) 2009-2012  Free Software Foundation
+;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
 ;; Author: Dan Davison
 ;;     Eric Schulte

=== modified file 'lisp/org/ob-picolisp.el'
--- a/lisp/org/ob-picolisp.el   2012-01-04 15:20:49 +0000
+++ b/lisp/org/ob-picolisp.el   2012-01-05 08:00:08 +0000
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
-;; Authors: Thorsten Jolitz and Eric Schulte
+;; Authors: Thorsten Jolitz
+;;         Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 

=== modified file 'lisp/org/ob-python.el'
--- a/lisp/org/ob-python.el     2012-01-04 14:14:29 +0000
+++ b/lisp/org/ob-python.el     2012-01-05 08:00:08 +0000
@@ -1,6 +1,6 @@
 ;;; ob-python.el --- org-babel functions for python evaluation
 
-;; Copyright (C) 2009-2012  Free Software Foundation
+;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;;     Dan Davison

=== modified file 'lisp/org/ob-ruby.el'
--- a/lisp/org/ob-ruby.el       2012-01-04 15:20:49 +0000
+++ b/lisp/org/ob-ruby.el       2012-01-05 08:00:08 +0000
@@ -1,6 +1,6 @@
 ;;; ob-ruby.el --- org-babel functions for ruby evaluation
 
-;; Copyright (C) 2009-2012  Free Software Foundation
+;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research

=== modified file 'lisp/org/ob-scheme.el'
--- a/lisp/org/ob-scheme.el     2012-01-04 14:14:29 +0000
+++ b/lisp/org/ob-scheme.el     2012-01-05 08:00:08 +0000
@@ -1,6 +1,6 @@
 ;;; ob-scheme.el --- org-babel functions for Scheme
 
-;; Copyright (C) 2010-2012 Free Software Foundation
+;; Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, scheme

=== modified file 'lisp/org/ob-screen.el'
--- a/lisp/org/ob-screen.el     2012-01-04 14:14:29 +0000
+++ b/lisp/org/ob-screen.el     2012-01-05 08:00:08 +0000
@@ -1,6 +1,6 @@
 ;;; ob-screen.el --- org-babel support for interactive terminal
 
-;; Copyright (C) 2009-2012  Free Software Foundation
+;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
 ;; Author: Benjamin Andresen
 ;; Keywords: literate programming, interactive shell

=== modified file 'lisp/org/ob-shen.el'
--- a/lisp/org/ob-shen.el       2012-01-04 14:14:29 +0000
+++ b/lisp/org/ob-shen.el       2012-01-05 08:00:08 +0000
@@ -1,6 +1,6 @@
 ;;; ob-shen.el --- org-babel functions for Shen
 
-;; Copyright (C) 2010-2012 Free Software Foundation
+;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, shen

=== modified file 'lisp/org/ob-sqlite.el'
--- a/lisp/org/ob-sqlite.el     2012-01-04 14:49:41 +0000
+++ b/lisp/org/ob-sqlite.el     2012-01-05 08:00:08 +0000
@@ -1,6 +1,6 @@
 ;;; ob-sqlite.el --- org-babel functions for sqlite database interaction
 
-;; Copyright (C) 2010-2012  Free Software Foundation
+;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research

=== modified file 'lisp/org/org-eshell.el'
--- a/lisp/org/org-eshell.el    2012-01-04 15:13:14 +0000
+++ b/lisp/org/org-eshell.el    2012-01-05 08:00:08 +0000
@@ -1,15 +1,16 @@
 ;;; org-eshell.el - Support for links to working directories in eshell
+
 ;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
-;;
+
 ;; Author: Konrad Hinsen <konrad.hinsen AT fastmail.net>
 ;; Version: 0.1
-;;
+
 ;; This file is part of GNU Emacs.
-;;
-;; Emacs is free software; you can redistribute it and/or modify
+
+;; 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, or (at your option)
-;; any later version.
+;; 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
@@ -17,10 +18,11 @@
 ;; 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:
+
+;;; Code:
 
 (require 'org)
 (require 'eshell)

=== modified file 'lisp/org/org-lparse.el'
--- a/lisp/org/org-lparse.el    2012-01-04 14:14:29 +0000
+++ b/lisp/org/org-lparse.el    2012-01-05 08:00:08 +0000
@@ -5,9 +5,8 @@
 ;; Author: Jambunathan K <kjambunathan at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;;
-;; This file is not (yet) part of GNU Emacs.
-;; However, it is distributed under the same license.
+
+;; 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
@@ -21,8 +20,7 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
+
 ;;; Commentary:
 
 ;; `org-lparse' is the entry point for the generic line-oriented
@@ -45,9 +43,6 @@
 ;; convert documents between various formats.  Use this to command,
 ;; for example, to convert odt file to doc or pdf format.
 
-;; See README.org file that comes with this library for answers to
-;; FAQs and more information on using this library.
-
 ;;; Code:
 (eval-when-compile
   (require 'cl))

=== modified file 'lisp/org/org-mouse.el'
--- a/lisp/org/org-mouse.el     2012-01-04 14:14:29 +0000
+++ b/lisp/org/org-mouse.el     2012-01-05 08:00:08 +0000
@@ -1,13 +1,12 @@
 ;;; org-mouse.el --- Better mouse support for org-mode
 
-;; Copyright (C) 2006-2012 Free Software Foundation
-;;
+;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
+
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
 
-;;
 ;; 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
@@ -20,8 +19,7 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
+
 ;;; Commentary:
 ;;
 ;; Org-mouse provides mouse support for org-mode.

=== modified file 'lisp/org/org-odt.el'
--- a/lisp/org/org-odt.el       2012-01-04 14:14:29 +0000
+++ b/lisp/org/org-odt.el       2012-01-05 08:00:08 +0000
@@ -5,9 +5,8 @@
 ;; Author: Jambunathan K <kjambunathan at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;;
-;; This file is not (yet) part of GNU Emacs.
-;; However, it is distributed under the same license.
+
+;; 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
@@ -21,8 +20,7 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
+
 ;;; Commentary:
 
 ;;; Code: