From 439d6b1c9bc790f8ae344a8caaeb5164123d8f0c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 12 Nov 2013 09:03:46 -0800 Subject: [PATCH] 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. --- lisp/org/ob-abc.el | 20 +++++++++----------- lisp/org/ob-ebnf.el | 18 ++++++++---------- lisp/org/ob-makefile.el | 2 +- lisp/org/org-macro.el | 2 ++ lisp/org/ox-ascii.el | 4 +++- lisp/org/ox-beamer.el | 4 +++- lisp/org/ox-html.el | 8 +++++--- lisp/org/ox-icalendar.el | 4 +++- lisp/org/ox-latex.el | 2 ++ lisp/org/ox-md.el | 4 +++- lisp/org/ox-org.el | 4 +++- lisp/org/ox-texinfo.el | 2 +- lisp/org/ox.el | 4 +++- 13 files changed, 46 insertions(+), 32 deletions(-) diff --git a/lisp/org/ob-abc.el b/lisp/org/ob-abc.el index a980b0225d..09f2e63fab 100644 --- a/lisp/org/ob-abc.el +++ b/lisp/org/ob-abc.el @@ -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 . ;;; Commentary: diff --git a/lisp/org/ob-ebnf.el b/lisp/org/ob-ebnf.el index 8c98d305d3..753f25f1c5 100644 --- a/lisp/org/ob-ebnf.el +++ b/lisp/org/ob-ebnf.el @@ -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 . ;;; Commentary: diff --git a/lisp/org/ob-makefile.el b/lisp/org/ob-makefile.el index 7b0ff932c4..517b5a683b 100644 --- a/lisp/org/ob-makefile.el +++ b/lisp/org/ob-makefile.el @@ -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 diff --git a/lisp/org/org-macro.el b/lisp/org/org-macro.el index fa74d8341b..61e9243b82 100644 --- a/lisp/org/org-macro.el +++ b/lisp/org/org-macro.el @@ -5,6 +5,8 @@ ;; Author: Nicolas Goaziou ;; 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 diff --git a/lisp/org/ox-ascii.el b/lisp/org/ox-ascii.el index 32262cc9a6..430bc6e618 100644 --- a/lisp/org/ox-ascii.el +++ b/lisp/org/ox-ascii.el @@ -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 ;; 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 diff --git a/lisp/org/ox-beamer.el b/lisp/org/ox-beamer.el index c5074f6819..2868944c95 100644 --- a/lisp/org/ox-beamer.el +++ b/lisp/org/ox-beamer.el @@ -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 ;; Nicolas Goaziou ;; 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 diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el index c47cc8610a..5aeaaf7bcc 100644 --- a/lisp/org/ox-html.el +++ b/lisp/org/ox-html.el @@ -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 ;; Jambunathan K ;; 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 @@ the headline itself.") @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 @@ means to use the maximum value consistent with other options." * @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 diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el index 8dfe836c9f..7c4b4bfbce 100644 --- a/lisp/org/ox-icalendar.el +++ b/lisp/org/ox-icalendar.el @@ -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 ;; Nicolas Goaziou ;; 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 diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el index 1da7f9bbc6..4dc0fd0737 100644 --- a/lisp/org/ox-latex.el +++ b/lisp/org/ox-latex.el @@ -5,6 +5,8 @@ ;; Author: Nicolas Goaziou ;; 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 diff --git a/lisp/org/ox-md.el b/lisp/org/ox-md.el index 7d540787d9..811c4e5805 100644 --- a/lisp/org/ox-md.el +++ b/lisp/org/ox-md.el @@ -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 ;; 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 diff --git a/lisp/org/ox-org.el b/lisp/org/ox-org.el index 41798b3e12..cecad56326 100644 --- a/lisp/org/ox-org.el +++ b/lisp/org/ox-org.el @@ -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 ;; 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 diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el index 5967978456..dcc9b79076 100644 --- a/lisp/org/ox-texinfo.el +++ b/lisp/org/ox-texinfo.el @@ -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 ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org/ox.el b/lisp/org/ox.el index f7566945a8..69dca68546 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -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 ;; 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 -- 2.20.1