diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 6 | ||||
| -rw-r--r-- | admin/README | 2 | ||||
| -rw-r--r-- | admin/admin.el | 2 | ||||
| -rw-r--r-- | admin/alloc-colors.c | 2 | ||||
| -rwxr-xr-x | admin/build-configs | 2 | ||||
| -rw-r--r-- | admin/cus-test.el | 2 | ||||
| -rwxr-xr-x | admin/diff-tar-files | 2 | ||||
| -rwxr-xr-x | admin/make-announcement | 2 | ||||
| -rwxr-xr-x | admin/make-emacs | 2 | ||||
| -rw-r--r-- | admin/notes/copyright | 66 | ||||
| -rwxr-xr-x | admin/nt/makedist.bat | 2 | ||||
| -rwxr-xr-x | admin/quick-install-emacs | 2 | ||||
| -rwxr-xr-x | admin/revdiff | 2 |
13 files changed, 81 insertions, 13 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 7349efb1720..51332e21cdc 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2007-07-25 Glenn Morris <rgm@gnu.org> + + * Relicense all FSF files to GPLv3 or later. + 2007-06-07 Glenn Morris <rgm@gnu.org> * admin.el (set-copyright): New function. @@ -433,7 +437,7 @@ 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 2, or (at your option) + 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, diff --git a/admin/README b/admin/README index e7124a04a8c..888c3cc242b 100644 --- a/admin/README +++ b/admin/README @@ -71,7 +71,7 @@ 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 2, or (at your option) +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, diff --git a/admin/admin.el b/admin/admin.el index 175eb6ded1b..94e64a23de9 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -7,7 +7,7 @@ ;; 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 2, or (at your option) +;; 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, diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index c336d808d58..22447643e5e 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c @@ -6,7 +6,7 @@ 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 2, or (at your option) +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, diff --git a/admin/build-configs b/admin/build-configs index b99b5405075..f36a05ca701 100755 --- a/admin/build-configs +++ b/admin/build-configs @@ -7,7 +7,7 @@ # # 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 2, or (at your option) +# 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, diff --git a/admin/cus-test.el b/admin/cus-test.el index cba8e31ac89..ac0c7b37909 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el @@ -12,7 +12,7 @@ ;; 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 2, or (at your option) +;; 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, diff --git a/admin/diff-tar-files b/admin/diff-tar-files index 03b5a00a12f..18d95451751 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files @@ -7,7 +7,7 @@ # # 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 2, or (at your option) +# 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, diff --git a/admin/make-announcement b/admin/make-announcement index 03a083e4c72..1c7b4574fea 100755 --- a/admin/make-announcement +++ b/admin/make-announcement @@ -9,7 +9,7 @@ ## 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 2, or (at your option) +## 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, diff --git a/admin/make-emacs b/admin/make-emacs index d6b14ca22b9..23b4e1c6374 100755 --- a/admin/make-emacs +++ b/admin/make-emacs @@ -7,7 +7,7 @@ # # 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 2, or (at your option) +# 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, diff --git a/admin/notes/copyright b/admin/notes/copyright index 91bf87f3b08..4ab01feeae3 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -598,12 +598,76 @@ Done: TUTORIAL.eo None known. +** NOTES ON RELICENSING TO GPL3 + +The EMACS_22_BASE branch was changed to GPLv3 (or later) 2007/07/25. + +Some notes: +(see http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg01431.html) + +1. There are some files in Emacs CVS which are not part of Emacs (eg +those included from Gnulib). These are all copyright FSF and (at time +of writing) GPL >= 2. rms says may as well leave the licenses of these +alone (may import them from Gnulib again). These are: + + Gnulib: + src/getloadavg.c + src/gmalloc.c + src/md5.c + src/md5.h + src/mktime.c + src/strftime.c + src/termcap.c + src/tparam.c + + Others: + config.guess + config.sub + lispintro/missing + man/texinfo.tex + +Note _not_ included in the above are src/regex.{c,h} (rms: "That +forked version is only in Emacs, so definitely relicense that."), and +oldXMenu/insque.c (rms: "We wrote that specifically for Emacs, so +definitely relicense that."). + +2. The files that are copyright FSF and AIST, or AIST alone, should be +and were updated, ditto the oldXMenu files with FSF copyright, and +msdos/is_exec.c and sigaction.c. + +3. lwlib/ + +Files originally in Lucid Widget Library were left alone (excludes +ChangeLog, etc), ie remain under GPL v1 or later, or v2 or later. +(rms: "We may as well leave this alone, since we are never going to +change it much.") + +4. There are some files where the FSF holds no copyright. These were +left alone: + + leim/MISC-DIC/CTLau-b5.html >= v2 + leim/MISC-DIC/CTLau.html >= v2 + (above included in lisp/international/titdic-cnv.el) + leim/MISC-DIC/pinyin.map >= v1 + leim/MISC-DIC/ziranma.cin >= v1 + leim/SKK-DIC/SKK-JISYO.L >= v2 + leim/SKK-DIC/README >= v2 + leim/ja-dic/ja-dic.el >= v2 + +5. At time of writing, some non-Emacs icons included from Gnome remain +under GPLv2 (no "or later"). See: + + etc/images/gnus/README + etc/images/mail/README + etc/images/README + nt/icons/README + 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 2, or (at your option) +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, diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat index 484ab88004c..87e151dd06a 100755 --- a/admin/nt/makedist.bat +++ b/admin/nt/makedist.bat @@ -12,7 +12,7 @@ rem This file is part of GNU Emacs. rem
rem GNU Emacs is free software; you can redistribute it and/or modify
rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; either version 2, or (at your option)
+rem the Free Software Foundation; either version 3, or (at your option)
rem any later version.
rem
rem GNU Emacs is distributed in the hope that it will be useful,
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index a6e70120e6d..e451cfcb2aa 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -10,7 +10,7 @@ ## 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 2, or (at your option) +## 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, diff --git a/admin/revdiff b/admin/revdiff index 78be1f62304..d9ea41782ba 100755 --- a/admin/revdiff +++ b/admin/revdiff @@ -7,7 +7,7 @@ # # 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 2, or (at your option) +# 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, |