diff options
| author | Glenn Morris <rgm@gnu.org> | 2007-02-28 04:17:38 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2007-02-28 04:17:38 +0000 |
| commit | fb89a85b6c559f10e28206b6f96ad9eacb99a6ba (patch) | |
| tree | 20f5f89f3607b1ffa665a5f6b085337073cfcca7 | |
| parent | 982a9db4c29eff01b651562d28a244ed892d03dc (diff) | |
| download | emacs-fb89a85b6c559f10e28206b6f96ad9eacb99a6ba.tar.gz | |
*** empty log message ***
| -rw-r--r-- | admin/notes/copyright | 17 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 |
2 files changed, 22 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 etc/emacs.csh - keep simple license for this simple file +etc/future-bug + - doesn't need a humourless disclaimer, because Karl Fogel says we + can consider it part of Emacs, and he has a blanker disclaimer for + Emacs changes. (email to rgm "[Emacs-commit] emacs/etc future-bug", + 2007028) + etc/letter.pbm,letter.xpm - trivial, no notice needed. <http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00324.html> @@ -164,6 +170,8 @@ SW.tit, TONEPY.tit, ZOZY.tit leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns, pinyin.map, ziranma.cin - leave the copyright alone. +Note that pinyin.map, ziranma.cin (and hence the generated +leim/quail/PY.el, ZIRANMA.el) are under GPLv1 or later. leim/SKK-DIC/SKK-JISYO.L ja-dic/ja-dic.el @@ -214,6 +222,11 @@ lwlib/ rms (2007/02/17): "lwlib is not assigned to the FSF; we don't consider it part of Emacs. [...] Therefore non-FSF copyrights are ok in lwlib." +Leave these files under GPLv1 or later. +[Note that lwlib.c and xlwmenu.c were installed in 1994 under GPLv2 or +later, but I reverted them to GPLv1 or later which I think is right +for the original lwlib/.] FIXME was this right? + FSF copyrights should only appear in files which have undergone non-trivial cumulative changes from the original versions in the Lucid Widget Library. NB this means that if you make non-trivial changes to @@ -512,6 +525,10 @@ etc/TUTORIAL* (translations) Done: TUTORIAL.eo +lwlib/* + should it be under GPLv1 or later, or v2 or later? + + This file is part of GNU Emacs. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 82373342a5b..5d8c1f20f43 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-02-28 Glenn Morris <rgm@gnu.org> + + * tutorial.el (tutorial--describe-nonstandard-key): Tweak text in + the menus case. + 2007-02-28 Chong Yidong <cyd@stupidchicken.com> * net/tramp.el (tramp-file-name-handler): Inhibit modification |