comparison admin/notes/copyright @ 83648:65663fcd2caa

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 824-838) - Update from CVS - Merge from emacs--rel--22 - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Fix void function definition error in cus-edit.el - Restore lisp/emacs-lisp/cl-loaddefs.el * emacs--rel--22 (patch 70-83) - Update from CVS - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Indicate that emacs--devo--0--patch-834 does not need to be applied - Merge from gnus--rel--5.10 - Restore lisp/emacs-lisp/cl-loaddefs.el * gnus--rel--5.10 (patch 239-241) - Merge from emacs--devo--0 - Update from CVS Revision: [e-mail]/emacs--multi-tty--0--patch-28

83647:3468e549a55b

*** These are copyright issues still to be addressed:

None known.



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)
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

83648:65663fcd2caa

*** These are copyright issues still to be addressed:

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 3, 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