aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris2007-02-28 04:17:38 +0000
committerGlenn Morris2007-02-28 04:17:38 +0000
commitfb89a85b6c559f10e28206b6f96ad9eacb99a6ba (patch)
tree20f5f89f3607b1ffa665a5f6b085337073cfcca7 /admin
parent982a9db4c29eff01b651562d28a244ed892d03dc (diff)
downloademacs-fb89a85b6c559f10e28206b6f96ad9eacb99a6ba.tar.gz
emacs-fb89a85b6c559f10e28206b6f96ad9eacb99a6ba.zip
*** empty log message ***
Diffstat (limited to 'admin')
-rw-r--r--admin/notes/copyright17
1 files changed, 17 insertions, 0 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright
index de7583c3e13..ad90988b258 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -139,6 +139,12 @@ etc/edt-user.doc
139etc/emacs.csh 139etc/emacs.csh
140 - keep simple license for this simple file 140 - keep simple license for this simple file
141 141
142etc/future-bug
143 - doesn't need a humourless disclaimer, because Karl Fogel says we
144 can consider it part of Emacs, and he has a blanker disclaimer for
145 Emacs changes. (email to rgm "[Emacs-commit] emacs/etc future-bug",
146 2007028)
147
142etc/letter.pbm,letter.xpm 148etc/letter.pbm,letter.xpm
143 - trivial, no notice needed. 149 - trivial, no notice needed.
144<http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00324.html> 150<http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00324.html>
@@ -164,6 +170,8 @@ SW.tit, TONEPY.tit, ZOZY.tit
164leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns, 170leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns,
165pinyin.map, ziranma.cin 171pinyin.map, ziranma.cin
166 - leave the copyright alone. 172 - leave the copyright alone.
173Note that pinyin.map, ziranma.cin (and hence the generated
174leim/quail/PY.el, ZIRANMA.el) are under GPLv1 or later.
167 175
168leim/SKK-DIC/SKK-JISYO.L 176leim/SKK-DIC/SKK-JISYO.L
169ja-dic/ja-dic.el 177ja-dic/ja-dic.el
@@ -214,6 +222,11 @@ lwlib/
214rms (2007/02/17): "lwlib is not assigned to the FSF; we don't consider 222rms (2007/02/17): "lwlib is not assigned to the FSF; we don't consider
215it part of Emacs. [...] Therefore non-FSF copyrights are ok in lwlib." 223it part of Emacs. [...] Therefore non-FSF copyrights are ok in lwlib."
216 224
225Leave these files under GPLv1 or later.
226[Note that lwlib.c and xlwmenu.c were installed in 1994 under GPLv2 or
227later, but I reverted them to GPLv1 or later which I think is right
228for the original lwlib/.] FIXME was this right?
229
217FSF copyrights should only appear in files which have undergone 230FSF copyrights should only appear in files which have undergone
218non-trivial cumulative changes from the original versions in the Lucid 231non-trivial cumulative changes from the original versions in the Lucid
219Widget Library. NB this means that if you make non-trivial changes to 232Widget Library. NB this means that if you make non-trivial changes to
@@ -512,6 +525,10 @@ etc/TUTORIAL* (translations)
512Done: TUTORIAL.eo 525Done: TUTORIAL.eo
513 526
514 527
528lwlib/*
529 should it be under GPLv1 or later, or v2 or later?
530
531
515 532
516This file is part of GNU Emacs. 533This file is part of GNU Emacs.
517 534