diff options
| author | Eric Blake <ebb9@byu.net> | 2008-04-04 09:09:47 -0600 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2008-04-05 17:04:48 -0600 |
| commit | a91e2a71d2af690517ebdfc96e9d7801e443398d (patch) | |
| tree | 781eb13cd2d5a485afae99eb5cb2f349465061e2 /lib/emacs | |
| parent | d165d14c0a8facf5bd598c250a6c056fc747be35 (diff) | |
| download | autoconf-a91e2a71d2af690517ebdfc96e9d7801e443398d.tar.gz | |
Use GPLv2+ plus exception as license for release.
Return back to GPLv2+, until the text of the exceptions is
finalized, reverting the change from 2007-07-03 and the first
part of the change from 2007-07-20.
Also:
* COPYING: Revert to GPLv2.
* COPYINGv3: New file, since some auxiliary build tools, used for
building autoconf and not installed, are GPLv3.
* Makefile.am (EXTRA_DIST): Distribute COPYINGv3.
* NEWS: Remove mention of GPLv3.
* README: Clarify situation regarding GPLv3.
Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'lib/emacs')
| -rw-r--r-- | lib/emacs/autoconf-mode.el | 8 | ||||
| -rw-r--r-- | lib/emacs/autotest-mode.el | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/lib/emacs/autoconf-mode.el b/lib/emacs/autoconf-mode.el index 41a1db8b..a0aec862 100644 --- a/lib/emacs/autoconf-mode.el +++ b/lib/emacs/autoconf-mode.el @@ -10,8 +10,8 @@ ;; ;; 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 of the License, or -;; (at your option) any later version. +;; the Free Software Foundation; either version 2, 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 @@ -19,7 +19,9 @@ ;; GNU General Public License for more details. ;; ;; 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 this program; if not, write to the Free Software +;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +;; 02110-1301, USA. ;; A major mode for editing autoconf input (like configure.in). ;; Derived from m4-mode.el by Andrew Csillag (drew@staff.prodigy.com) diff --git a/lib/emacs/autotest-mode.el b/lib/emacs/autotest-mode.el index 6146280b..006d99cf 100644 --- a/lib/emacs/autotest-mode.el +++ b/lib/emacs/autotest-mode.el @@ -9,8 +9,8 @@ ;; ;; 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 of the License, or -;; (at your option) any later version. +;; the Free Software Foundation; either version 2, 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 @@ -18,7 +18,9 @@ ;; GNU General Public License for more details. ;; ;; 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 this program; if not, write to the Free Software +;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +;; 02110-1301, USA. ;;; Commentary: |