[Emacs-diffs] /srv/bzr/emacs/trunk r107728: Fix copyright and authors lines in Org

[Bastien Guerry]

------------------------------------------------------------
revno: 107728
committer: Bastien Guerry <address@hidden>
branch nick: trunk
timestamp: Sun 2012-04-01 22:27:06 +0200
message:
  Fix copyright and authors lines in Org
modified:
  doc/misc/org.texi
  etc/org/README
  etc/refcards/orgcard.tex
  lisp/org/ob-asymptote.el
  lisp/org/ob-exp.el
  lisp/org/ob-fortran.el
  lisp/org/ob-js.el
  lisp/org/ob-lisp.el
  lisp/org/ob-lob.el
  lisp/org/ob-maxima.el
  lisp/org/ob-perl.el
  lisp/org/ob-picolisp.el
  lisp/org/ob-python.el
  lisp/org/ob-ref.el
  lisp/org/ob-scheme.el
  lisp/org/ob.el
  lisp/org/org-ascii.el
  lisp/org/org-attach.el
  lisp/org/org-bbdb.el
  lisp/org/org-beamer.el
  lisp/org/org-bibtex.el
  lisp/org/org-capture.el
  lisp/org/org-clock.el
  lisp/org/org-colview.el
  lisp/org/org-compat.el
  lisp/org/org-datetree.el
  lisp/org/org-docbook.el
  lisp/org/org-mac-message.el
  lisp/org/org-protocol.el
  lisp/org/org-special-blocks.el
  lisp/org/org-xoxo.el
  lisp/org/org.el

=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2012-04-01 09:49:25 +0000
+++ b/doc/misc/org.texi 2012-04-01 20:27:06 +0000
@@ -265,7 +265,7 @@
 @copying
 This manual is for Org version @value{VERSION}.
 
-Copyright @copyright{} 2004-2011  Free Software Foundation, Inc.
+Copyright @copyright{} 2004-2012  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

=== modified file 'etc/org/README'
--- a/etc/org/README    2012-04-01 09:49:25 +0000
+++ b/etc/org/README    2012-04-01 20:27:06 +0000
@@ -1,7 +1,7 @@
 The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the
 following copyright information:
 
-Copyright (C) 2010-2011 Free Software Foundation, Inc.
+Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
 These files are part of GNU Emacs.
 

=== modified file 'etc/refcards/orgcard.tex'
--- a/etc/refcards/orgcard.tex  2012-04-01 09:49:25 +0000
+++ b/etc/refcards/orgcard.tex  2012-04-01 20:27:06 +0000
@@ -17,7 +17,7 @@
 \pdflayout=(0l)
 
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2012
 %   Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.

=== modified file 'lisp/org/ob-asymptote.el'
--- a/lisp/org/ob-asymptote.el  2012-01-04 14:14:29 +0000
+++ b/lisp/org/ob-asymptote.el  2012-04-01 20:27:06 +0000
@@ -1,6 +1,6 @@
 ;;; ob-asymptote.el --- org-babel functions for asymptote 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-exp.el'
--- a/lisp/org/ob-exp.el        2012-04-01 09:49:25 +0000
+++ b/lisp/org/ob-exp.el        2012-04-01 20:27:06 +0000
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte
+;; Authors: Eric Schulte
 ;;     Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org

=== modified file 'lisp/org/ob-fortran.el'
--- a/lisp/org/ob-fortran.el    2012-04-01 19:55:11 +0000
+++ b/lisp/org/ob-fortran.el    2012-04-01 20:27:06 +0000
@@ -2,7 +2,8 @@
 
 ;; 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
 

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

=== modified file 'lisp/org/ob-lisp.el'
--- a/lisp/org/ob-lisp.el       2012-01-04 14:14:29 +0000
+++ b/lisp/org/ob-lisp.el       2012-04-01 20:27:06 +0000
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
-;; Author: Joel Boehland
-;;     Eric Schulte
-;;     David T. O'Toole <address@hidden>
+;; Authors: Joel Boehland
+;;      Eric Schulte
+;;      David T. O'Toole <address@hidden>
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 

=== modified file 'lisp/org/ob-lob.el'
--- a/lisp/org/ob-lob.el        2012-04-01 09:49:25 +0000
+++ b/lisp/org/ob-lob.el        2012-04-01 20:27:06 +0000
@@ -2,8 +2,8 @@
 
 ;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte
-;;     Dan Davison
+;; Authors: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 

=== modified file 'lisp/org/ob-maxima.el'
--- a/lisp/org/ob-maxima.el     2012-04-01 09:49:25 +0000
+++ b/lisp/org/ob-maxima.el     2012-04-01 20:27:06 +0000
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric S Fraga
-;;        Eric Schulte
+;;     Eric Schulte
 ;; Keywords: literate programming, reproducible research, maxima
 ;; Homepage: http://orgmode.org
 

=== modified file 'lisp/org/ob-perl.el'
--- a/lisp/org/ob-perl.el       2012-01-05 08:00:08 +0000
+++ b/lisp/org/ob-perl.el       2012-04-01 20:27:06 +0000
@@ -2,8 +2,8 @@
 
 ;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
-;; Author: Dan Davison
-;;     Eric Schulte
+;; Authors: Dan Davison
+;;      Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 

=== modified file 'lisp/org/ob-picolisp.el'
--- a/lisp/org/ob-picolisp.el   2012-01-05 08:00:08 +0000
+++ b/lisp/org/ob-picolisp.el   2012-04-01 20:27:06 +0000
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
 ;; Authors: Thorsten Jolitz
-;;         Eric Schulte
+;;      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-05 08:00:08 +0000
+++ b/lisp/org/ob-python.el     2012-04-01 20:27:06 +0000
@@ -2,8 +2,8 @@
 
 ;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte
-;;     Dan Davison
+;; Authors: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 

=== modified file 'lisp/org/ob-ref.el'
--- a/lisp/org/ob-ref.el        2012-01-04 15:20:49 +0000
+++ b/lisp/org/ob-ref.el        2012-04-01 20:27:06 +0000
@@ -2,8 +2,8 @@
 
 ;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte
-;;     Dan Davison
+;; Authors: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 

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

=== modified file 'lisp/org/ob.el'
--- a/lisp/org/ob.el    2012-04-01 09:49:25 +0000
+++ b/lisp/org/ob.el    2012-04-01 20:27:06 +0000
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte
+;; Authors: Eric Schulte
 ;;     Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org

=== modified file 'lisp/org/org-ascii.el'
--- a/lisp/org/org-ascii.el     2012-04-01 09:49:25 +0000
+++ b/lisp/org/org-ascii.el     2012-04-01 20:27:06 +0000
@@ -1,6 +1,6 @@
 ;;; org-ascii.el --- ASCII export for Org-mode
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2012  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

=== modified file 'lisp/org/org-attach.el'
--- a/lisp/org/org-attach.el    2012-04-01 09:49:25 +0000
+++ b/lisp/org/org-attach.el    2012-04-01 20:27:06 +0000
@@ -1,6 +1,6 @@
 ;;; org-attach.el --- Manage file attachments to org-mode tasks
 
-;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <address@hidden>
 ;; Keywords: org data task

=== modified file 'lisp/org/org-bbdb.el'
--- a/lisp/org/org-bbdb.el      2012-04-01 09:49:25 +0000
+++ b/lisp/org/org-bbdb.el      2012-04-01 20:27:06 +0000
@@ -1,9 +1,9 @@
 ;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2012  Free Software Foundation, Inc.
 
-;; Author: Carsten Dominik <carsten at orgmode dot org>,
-;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
+;; Authors: Carsten Dominik <carsten at orgmode dot org>
+;;       Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
 ;;

=== modified file 'lisp/org/org-beamer.el'
--- a/lisp/org/org-beamer.el    2012-04-01 09:49:25 +0000
+++ b/lisp/org/org-beamer.el    2012-04-01 20:27:06 +0000
@@ -1,6 +1,6 @@
 ;;; org-beamer.el --- Beamer-specific LaTeX export for org-mode
 ;;
-;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2012  Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>

=== modified file 'lisp/org/org-bibtex.el'
--- a/lisp/org/org-bibtex.el    2012-04-01 09:49:25 +0000
+++ b/lisp/org/org-bibtex.el    2012-04-01 20:27:06 +0000
@@ -1,10 +1,10 @@
 ;;; org-bibtex.el --- Org links to BibTeX entries
 ;;
-;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2012  Free Software Foundation, Inc.
 ;;
-;; Author: Bastien Guerry <bzg at altern dot org>
-;;         Carsten Dominik <carsten dot dominik at gmail dot com>
-;;         Eric Schulte <schulte dot eric at gmail dot com>
+;; Authors: Bastien Guerry <bzg at altern dot org>
+;;       Carsten Dominik <carsten dot dominik at gmail dot com>
+;;       Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: org, wp, remember
 ;;
 ;; This file is part of GNU Emacs.

=== modified file 'lisp/org/org-capture.el'
--- a/lisp/org/org-capture.el   2012-04-01 09:49:25 +0000
+++ b/lisp/org/org-capture.el   2012-04-01 20:27:06 +0000
@@ -1,6 +1,6 @@
 ;;; org-capture.el --- Fast note taking in Org-mode
 
-;; Copyright (C) 2010-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

=== modified file 'lisp/org/org-clock.el'
--- a/lisp/org/org-clock.el     2012-04-01 09:49:25 +0000
+++ b/lisp/org/org-clock.el     2012-04-01 20:27:06 +0000
@@ -1,6 +1,6 @@
 ;;; org-clock.el --- The time clocking code for Org-mode
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2012  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

=== modified file 'lisp/org/org-colview.el'
--- a/lisp/org/org-colview.el   2012-04-01 09:49:25 +0000
+++ b/lisp/org/org-colview.el   2012-04-01 20:27:06 +0000
@@ -1,6 +1,6 @@
 ;;; org-colview.el --- Column View in Org-mode
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2012  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

=== modified file 'lisp/org/org-compat.el'
--- a/lisp/org/org-compat.el    2012-01-19 07:21:25 +0000
+++ b/lisp/org/org-compat.el    2012-04-01 20:27:06 +0000
@@ -1,6 +1,6 @@
 ;;; org-compat.el --- Compatibility code for Org-mode
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2012  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

=== modified file 'lisp/org/org-datetree.el'
--- a/lisp/org/org-datetree.el  2012-01-19 07:21:25 +0000
+++ b/lisp/org/org-datetree.el  2012-04-01 20:27:06 +0000
@@ -1,6 +1,6 @@
 ;;; org-datetree.el --- Create date entries in a tree
 
-;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

=== modified file 'lisp/org/org-docbook.el'
--- a/lisp/org/org-docbook.el   2012-01-19 07:21:25 +0000
+++ b/lisp/org/org-docbook.el   2012-04-01 20:27:06 +0000
@@ -1,6 +1,6 @@
 ;;; org-docbook.el --- DocBook exporter for org-mode
 ;;
-;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2012  Free Software Foundation, Inc.
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-docbook.el

=== modified file 'lisp/org/org-mac-message.el'
--- a/lisp/org/org-mac-message.el       2012-01-19 07:21:25 +0000
+++ b/lisp/org/org-mac-message.el       2012-04-01 20:27:06 +0000
@@ -1,9 +1,9 @@
 ;;; org-mac-message.el --- Links to Apple Mail.app messages from within 
Org-mode
 
-;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2012  Free Software Foundation, Inc.
 
-;; Author: John Wiegley <address@hidden>
-;;         Christopher Suckling <suckling at gmail dot com>
+;; Authors: John Wiegley <address@hidden>
+;;       Christopher Suckling <suckling at gmail dot com>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 

=== modified file 'lisp/org/org-protocol.el'
--- a/lisp/org/org-protocol.el  2012-04-01 09:49:25 +0000
+++ b/lisp/org/org-protocol.el  2012-04-01 20:27:06 +0000
@@ -1,12 +1,11 @@
 ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom 
actions.
 ;;
-;; Copyright (C) 2008-2012
-;;          Free Software Foundation, Inc.
+;; Copyright (C) 2008-2012  Free Software Foundation, Inc.
 ;;
-;; Author: Bastien Guerry <bzg AT gnu DOT org>
-;; Author: Daniel M German <dmg AT uvic DOT org>
-;; Author: Sebastian Rose <sebastian_rose AT gmx DOT de>
-;; Author: Ross Patterson <me AT rpatterson DOT net>
+;; Authors: Bastien Guerry <bzg AT gnu DOT org>
+;;       Daniel M German <dmg AT uvic DOT org>
+;;       Sebastian Rose <sebastian_rose AT gmx DOT de>
+;;       Ross Patterson <me AT rpatterson DOT net>
 ;; Maintainer: Sebastian Rose <sebastian_rose AT gmx DOT de>
 ;; Keywords: org, emacsclient, wp
 

=== modified file 'lisp/org/org-special-blocks.el'
--- a/lisp/org/org-special-blocks.el    2012-04-01 09:49:25 +0000
+++ b/lisp/org/org-special-blocks.el    2012-04-01 20:27:06 +0000
@@ -1,3 +1,4 @@
+;;; org-special-blocks.el --- handle Org special blocks
 ;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
 ;; Author: Chris Gray <address@hidden>

=== modified file 'lisp/org/org-xoxo.el'
--- a/lisp/org/org-xoxo.el      2012-01-19 07:21:25 +0000
+++ b/lisp/org/org-xoxo.el      2012-04-01 20:27:06 +0000
@@ -1,6 +1,6 @@
 ;;; org-xoxo.el --- XOXO export for Org-mode
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2012  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el   2012-04-01 18:37:50 +0000
+++ b/lisp/org/org.el   2012-04-01 20:27:06 +0000
@@ -1,6 +1,6 @@
 ;;; org.el --- Outline-based notes management and organizer
 ;; Carstens outline-mode for keeping track of everything.
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2012  Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Maintainer: Bastien Guerry <bzg at gnu dot org>