[Emacs-diffs] trunk r115080: Fix and standardize some copyright and license notices

[Glenn Morris]

------------------------------------------------------------
revno: 115080
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-11-12 09:03:46 -0800
message:
  Fix and standardize some copyright and license notices
  
  * ob-abc.el: Add year, part of Emacs, standardize license text.
  
  * ob-ebnf.el: Part of Emacs, standardize license text.
  
  * ob-makefile.el: Fix years.
  
  * org-macro.el, ox-beamer.el, ox-latex.el, ox-org.el: Part of Emacs.
  
  * ox-ascii.el, ox-md.el, ox.el: Use range for years, part of Emacs.
  
  * ox-html.el: Part of Emacs.
  (org-html-scripts): Add 2013 to copyright years.
  (org-html-infojs-template): Set copyright holder to FSF.
  
  * ox-icalendar.el: Part of Emacs, fix years.
  
  * ox-texinfo.el: Copyright to FSF, use range for years.
modified:
  lisp/org/ob-abc.el             obabc.el-20131112130502-8825zrk0dp6b9sq5-1
  lisp/org/ob-ebnf.el            obebnf.el-20131112130502-8825zrk0dp6b9sq5-3
  lisp/org/ob-makefile.el        obmakefile.el-20131112130502-8825zrk0dp6b9sq5-4
  lisp/org/org-macro.el          orgmacro.el-20131112130502-8825zrk0dp6b9sq5-6
  lisp/org/ox-ascii.el           oxascii.el-20131112130502-8825zrk0dp6b9sq5-7
  lisp/org/ox-beamer.el          oxbeamer.el-20131112130502-8825zrk0dp6b9sq5-8
  lisp/org/ox-html.el            oxhtml.el-20131112130502-8825zrk0dp6b9sq5-9
  lisp/org/ox-icalendar.el       
oxicalendar.el-20131112130502-8825zrk0dp6b9sq5-10
  lisp/org/ox-latex.el           oxlatex.el-20131112130502-8825zrk0dp6b9sq5-11
  lisp/org/ox-md.el              oxmd.el-20131112130502-8825zrk0dp6b9sq5-13
  lisp/org/ox-org.el             oxorg.el-20131112130502-8825zrk0dp6b9sq5-15
  lisp/org/ox-texinfo.el         oxtexinfo.el-20131112130502-8825zrk0dp6b9sq5-17
  lisp/org/ox.el                 ox.el-20131112130502-8825zrk0dp6b9sq5-18

=== modified file 'lisp/org/ob-abc.el'
--- a/lisp/org/ob-abc.el        2013-11-12 13:06:26 +0000
+++ b/lisp/org/ob-abc.el        2013-11-12 17:03:46 +0000
@@ -1,28 +1,26 @@
 ;;; ob-abc.el --- org-babel functions for template evaluation
 
-;; Copyright (C) Free Software Foundation
+;; Copyright (C) 2013 Free Software Foundation, Inc.
 
 ;; Author: William Waites
 ;; Keywords: literate programming, music
 ;; Homepage: http://www.tardis.ed.ac.uk/wwaites
 ;; Version: 0.01
 
-;;; 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/ob-ebnf.el'
--- a/lisp/org/ob-ebnf.el       2013-11-12 13:06:26 +0000
+++ b/lisp/org/ob-ebnf.el       2013-11-12 17:03:46 +0000
@@ -7,22 +7,20 @@
 ;; Homepage: http://orgmode.org
 ;; Version: 1.00
 
-;;; 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/ob-makefile.el'
--- a/lisp/org/ob-makefile.el   2013-11-12 13:06:26 +0000
+++ b/lisp/org/ob-makefile.el   2013-11-12 17:03:46 +0000
@@ -1,6 +1,6 @@
 ;;; ob-makefile.el --- org-babel functions for makefile evaluation
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte and Thomas S. Dye
 ;; Keywords: literate programming, reproducible research

=== modified file 'lisp/org/org-macro.el'
--- a/lisp/org/org-macro.el     2013-11-12 13:06:26 +0000
+++ b/lisp/org/org-macro.el     2013-11-12 17:03:46 +0000
@@ -5,6 +5,8 @@
 ;; Author: Nicolas Goaziou <address@hidden>
 ;; Keywords: outlines, hypermedia, calendar, wp
 
+;; 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

=== modified file 'lisp/org/ox-ascii.el'
--- a/lisp/org/ox-ascii.el      2013-11-12 13:06:26 +0000
+++ b/lisp/org/ox-ascii.el      2013-11-12 17:03:46 +0000
@@ -1,10 +1,12 @@
 ;;; ox-ascii.el --- ASCII Back-End for Org Export Engine
 
-;; Copyright (C) 2012, 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 
+;; 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

=== modified file 'lisp/org/ox-beamer.el'
--- a/lisp/org/ox-beamer.el     2013-11-12 13:06:26 +0000
+++ b/lisp/org/ox-beamer.el     2013-11-12 17:03:46 +0000
@@ -1,11 +1,13 @@
 ;;; ox-beamer.el --- Beamer Back-End for Org Export Engine
 
-;; Copyright (C) 2007-2013  Free Software Foundation, Inc.
+;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;;         Nicolas Goaziou <n.goaziou AT gmail DOT com>
 ;; Keywords: org, wp, tex
 
+;; 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

=== modified file 'lisp/org/ox-html.el'
--- a/lisp/org/ox-html.el       2013-11-12 13:06:26 +0000
+++ b/lisp/org/ox-html.el       2013-11-12 17:03:46 +0000
@@ -1,11 +1,13 @@
 ;;; ox-html.el --- HTML Back-End for Org Export Engine
 
-;; Copyright (C) 2011-2013  Free Software Foundation, Inc.
+;; Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;      Jambunathan K <kjambunathan at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 
+;; 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
@@ -184,7 +186,7 @@
 @licstart  The following is the entire license notice for the
 JavaScript code in this tag.
 
-Copyright (C) 2012  Free Software Foundation, Inc.
+Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 The JavaScript code in this tag is free software: you can
 redistribute it and/or modify it under the terms of the GNU
@@ -381,7 +383,7 @@
  * @licstart  The following is the entire license notice for the
  *  JavaScript code in %SCRIPT_PATH.
  *
- * Copyright (C) 2012-2013  Sebastian Rose
+ * Copyright (C) 2012-2013 Free Software Foundation, Inc.
  *
  *
  * The JavaScript code in this tag is free software: you can

=== modified file 'lisp/org/ox-icalendar.el'
--- a/lisp/org/ox-icalendar.el  2013-11-12 13:06:26 +0000
+++ b/lisp/org/ox-icalendar.el  2013-11-12 17:03:46 +0000
@@ -1,12 +1,14 @@
 ;;; ox-icalendar.el --- iCalendar Back-End for Org Export Engine
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2013 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;      Nicolas Goaziou <n dot goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.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

=== modified file 'lisp/org/ox-latex.el'
--- a/lisp/org/ox-latex.el      2013-11-12 13:06:26 +0000
+++ b/lisp/org/ox-latex.el      2013-11-12 17:03:46 +0000
@@ -5,6 +5,8 @@
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 
+;; 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

=== modified file 'lisp/org/ox-md.el'
--- a/lisp/org/ox-md.el 2013-11-12 13:06:26 +0000
+++ b/lisp/org/ox-md.el 2013-11-12 17:03:46 +0000
@@ -1,10 +1,12 @@
 ;;; ox-md.el --- Markdown Back-End for Org Export Engine
 
-;; Copyright (C) 2012, 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <address@hidden>
 ;; Keywords: org, wp, markdown
 
+;; 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

=== modified file 'lisp/org/ox-org.el'
--- a/lisp/org/ox-org.el        2013-11-12 13:06:26 +0000
+++ b/lisp/org/ox-org.el        2013-11-12 17:03:46 +0000
@@ -1,10 +1,12 @@
 ;;; ox-org.el --- Org Back-End for Org Export Engine
 
-;; Copyright (C) 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2013 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <address@hidden>
 ;; Keywords: org, wp
 
+;; 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

=== modified file 'lisp/org/ox-texinfo.el'
--- a/lisp/org/ox-texinfo.el    2013-11-12 13:06:26 +0000
+++ b/lisp/org/ox-texinfo.el    2013-11-12 17:03:46 +0000
@@ -1,6 +1,6 @@
 ;;; ox-texinfo.el --- Texinfo Back-End for Org Export Engine
 
-;; Copyright (C) 2012, 2013  Jonathan Leech-Pepin
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
 ;; Author: Jonathan Leech-Pepin <jonathan.leechpepin at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 

=== modified file 'lisp/org/ox.el'
--- a/lisp/org/ox.el    2013-11-12 13:06:26 +0000
+++ b/lisp/org/ox.el    2013-11-12 17:03:46 +0000
@@ -1,10 +1,12 @@
 ;;; ox.el --- Generic Export Engine for Org Mode
 
-;; Copyright (C) 2012, 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 
+;; 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