[Emacs-diffs] /srv/bzr/emacs/trunk r105415: Fix copyrights, licenses, etc in new Org files.

[Glenn Morris]

------------------------------------------------------------
revno: 105415
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-08-06 14:23:50 -0700
message:
  Fix copyrights, licenses, etc in new Org files.
modified:
  lisp/org/ob-awk.el
  lisp/org/ob-lilypond.el
  lisp/org/ob-maxima.el
  lisp/org/org-pcomplete.el
  lisp/org/org-special-blocks.el

=== modified file 'lisp/org/ob-awk.el'
--- a/lisp/org/ob-awk.el        2011-07-28 15:13:49 +0000
+++ b/lisp/org/ob-awk.el        2011-08-06 21:23:50 +0000
@@ -24,8 +24,6 @@
 
 ;;; Commentary:
 
-;;; Commentary:
-
 ;; Babel's awk can use special header argument:
 ;; 
 ;; - :in-file takes a path to a file of data to be processed by awk

=== modified file 'lisp/org/ob-lilypond.el'
--- a/lisp/org/ob-lilypond.el   2011-07-28 15:13:49 +0000
+++ b/lisp/org/ob-lilypond.el   2011-08-06 21:23:50 +0000
@@ -1,6 +1,6 @@
 ;;; ob-lilypond.el --- org-babel functions for lilypond evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Martyn Jago
 ;; Keywords: babel language, literate programming

=== modified file 'lisp/org/ob-maxima.el'
--- a/lisp/org/ob-maxima.el     2011-07-28 15:13:49 +0000
+++ b/lisp/org/ob-maxima.el     2011-08-06 21:23:50 +0000
@@ -1,28 +1,27 @@
 ;;; ob-maxima.el --- org-babel functions for maxima evaluation
 
-;; Copyright (c) 2009, 2010, 2011 Eric S Fraga, Eric Schulte
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric S Fraga, Eric Schulte
+;; Author: Eric S Fraga
+;;        Eric Schulte
 ;; Keywords: literate programming, reproducible research, maxima
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; This program 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.
-;;
-;; 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:
 

=== modified file 'lisp/org/org-pcomplete.el'
--- a/lisp/org/org-pcomplete.el 2011-08-02 00:37:49 +0000
+++ b/lisp/org/org-pcomplete.el 2011-08-06 21:23:50 +0000
@@ -1,7 +1,6 @@
 ;;; org-pcomplete.el --- In-buffer completion code
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         John Wiegley <johnw at gnu dot org>

=== modified file 'lisp/org/org-special-blocks.el'
--- a/lisp/org/org-special-blocks.el    2011-07-28 15:13:49 +0000
+++ b/lisp/org/org-special-blocks.el    2011-08-06 21:23:50 +0000
@@ -1,25 +1,23 @@
 ;;; org-special-blocks.el --- Turn blocks into LaTeX envs and HTML divs
 
-;; Copyright (C) 2009 Chris Gray
+;; Copyright (C) 2009, 2011  Free Software Foundation, Inc.
 
 ;; Author: Chris Gray <address@hidden>
 
 ;; This file is 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.
+;; 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.
 
-;; 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.
+;; 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 this program ; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;