comparison admin/notes/copyright @ 90996:f55f9811f5d7

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 824-831) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 70-74) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
author Miles Bader <miles@gnu.org>
date Fri, 27 Jul 2007 10:52:18 +0000
parents e9f94688a064 b5f8f65b3576
children 606f2d163a64
comparison
equal deleted inserted replaced
90995:9a391d85a79f 90996:f55f9811f5d7
596 *** These are copyright issues still to be addressed: 596 *** These are copyright issues still to be addressed:
597 597
598 None known. 598 None known.
599 599
600 600
601 ** NOTES ON RELICENSING TO GPL3
602
603 The EMACS_22_BASE branch was changed to GPLv3 (or later) 2007/07/25.
604
605 Some notes:
606 (see http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg01431.html)
607
608 1. There are some files in Emacs CVS which are not part of Emacs (eg
609 those included from Gnulib). These are all copyright FSF and (at time
610 of writing) GPL >= 2. rms says may as well leave the licenses of these
611 alone (may import them from Gnulib again). These are:
612
613 Gnulib:
614 src/getloadavg.c
615 src/gmalloc.c
616 src/md5.c
617 src/md5.h
618 src/mktime.c
619 src/strftime.c
620 src/termcap.c
621 src/tparam.c
622
623 Others:
624 config.guess
625 config.sub
626 lispintro/missing
627 man/texinfo.tex
628
629 Note _not_ included in the above are src/regex.{c,h} (rms: "That
630 forked version is only in Emacs, so definitely relicense that."), and
631 oldXMenu/insque.c (rms: "We wrote that specifically for Emacs, so
632 definitely relicense that.").
633
634 2. The files that are copyright FSF and AIST, or AIST alone, should be
635 and were updated, ditto the oldXMenu files with FSF copyright, and
636 msdos/is_exec.c and sigaction.c.
637
638 3. lwlib/
639
640 Files originally in Lucid Widget Library were left alone (excludes
641 ChangeLog, etc), ie remain under GPL v1 or later, or v2 or later.
642 (rms: "We may as well leave this alone, since we are never going to
643 change it much.")
644
645 4. There are some files where the FSF holds no copyright. These were
646 left alone:
647
648 leim/MISC-DIC/CTLau-b5.html >= v2
649 leim/MISC-DIC/CTLau.html >= v2
650 (above included in lisp/international/titdic-cnv.el)
651 leim/MISC-DIC/pinyin.map >= v1
652 leim/MISC-DIC/ziranma.cin >= v1
653 leim/SKK-DIC/SKK-JISYO.L >= v2
654 leim/SKK-DIC/README >= v2
655 leim/ja-dic/ja-dic.el >= v2
656
657 5. At time of writing, some non-Emacs icons included from Gnome remain
658 under GPLv2 (no "or later"). See:
659
660 etc/images/gnus/README
661 etc/images/mail/README
662 etc/images/README
663 nt/icons/README
664
601 665
602 This file is part of GNU Emacs. 666 This file is part of GNU Emacs.
603 667
604 GNU Emacs is free software; you can redistribute it and/or modify 668 GNU Emacs is free software; you can redistribute it and/or modify
605 it under the terms of the GNU General Public License as published by 669 it under the terms of the GNU General Public License as published by
606 the Free Software Foundation; either version 2, or (at your option) 670 the Free Software Foundation; either version 3, or (at your option)
607 any later version. 671 any later version.
608 672
609 GNU Emacs is distributed in the hope that it will be useful, 673 GNU Emacs is distributed in the hope that it will be useful,
610 but WITHOUT ANY WARRANTY; without even the implied warranty of 674 but WITHOUT ANY WARRANTY; without even the implied warranty of
611 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 675 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the