Skip to content

Commit

Permalink
Add COPYING and fix other related issues.
Browse files Browse the repository at this point in the history
Mention COPYING in READMEs.
Fix the header of ob-fortran.el (see this fix in Emacs trunk:
http://lists.gnu.org/archive/html/emacs-diffs/2012-09/msg00365.html)
Specify that org-colview-xemacs.el is *not* part of Emacs.
Specify that org-element.el is part of Emacs (prepare the sync.)
Add COPYING in the release (mk/server.mk).
  • Loading branch information
Bastien Guerry committed Sep 24, 2012
1 parent c92a2a5 commit 9aff6ff
Show file tree
Hide file tree
Showing 7 changed files with 703 additions and 25 deletions.
674 changes: 674 additions & 0 deletions COPYING

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ This distribution contains:
README
This file.

COPYING
The GNU General Public License.

Makefile
The makefile to compile and install Org. For installation
instructions, see the manual or the more detailed procedure
Expand Down
3 changes: 3 additions & 0 deletions README_git
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ README_contribute
README_maintainer
Information for the maintainer.

COPYING
The GNU General Public License.

Makefile
The makefile to compile and install Org. For installation
instructions, see the manual or the more detailed procedure
Expand Down
18 changes: 9 additions & 9 deletions lisp/ob-fortran.el
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
;; Keywords: literate programming, reproducible research, fortran
;; Homepage: http://orgmode.org

;; 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 3, or (at your option)
;; any later version.
;; This file is part of GNU Emacs.
;;
;; This program is distributed in the hope that it will be useful,
;; 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.

;; 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:

Expand Down
18 changes: 8 additions & 10 deletions lisp/org-colview-xemacs.el
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
;;; org-colview-xemacs.el --- Column View in Org-mode, XEmacs-specific version

;; Copyright (C) 2004-2012
;; Free Software Foundation, Inc.
;; Carsten Dominik

;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;;
;; This file is part of GNU Emacs.
;; This file is part of Org mode, it is not 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.
;; 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.

;; GNU Emacs is distributed in the hope that it will be useful,
;; This file 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 this file; see the file COPYING.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;;; Commentary:
Expand Down
10 changes: 5 additions & 5 deletions lisp/org-element.el
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
;; Keywords: outlines, hypermedia, calendar, wp

;; 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 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; 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.

;; This file is not part of GNU Emacs.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:
;;
Expand Down
2 changes: 1 addition & 1 deletion mk/server.mk
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ SERVERMK ?= true # or just any value at all, really

#----------------------------------------------------------------------

ORGFULL = README lisp/ \
ORGFULL = README COPYING lisp/ \
Makefile request-assign-future.txt \
mk/default.mk mk/targets.mk mk/version.mk \
mk/org-fixup.el \
Expand Down

0 comments on commit 9aff6ff

Please sign in to comment.