diff options
| author | Glenn Morris | 2007-02-28 04:17:38 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-02-28 04:17:38 +0000 |
| commit | fb89a85b6c559f10e28206b6f96ad9eacb99a6ba (patch) | |
| tree | 20f5f89f3607b1ffa665a5f6b085337073cfcca7 /admin | |
| parent | 982a9db4c29eff01b651562d28a244ed892d03dc (diff) | |
| download | emacs-fb89a85b6c559f10e28206b6f96ad9eacb99a6ba.tar.gz emacs-fb89a85b6c559f10e28206b6f96ad9eacb99a6ba.zip | |
*** empty log message ***
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/notes/copyright | 17 |
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 | |||
| 139 | etc/emacs.csh | 139 | etc/emacs.csh |
| 140 | - keep simple license for this simple file | 140 | - keep simple license for this simple file |
| 141 | 141 | ||
| 142 | etc/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 | |||
| 142 | etc/letter.pbm,letter.xpm | 148 | etc/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 | |||
| 164 | leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns, | 170 | leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns, |
| 165 | pinyin.map, ziranma.cin | 171 | pinyin.map, ziranma.cin |
| 166 | - leave the copyright alone. | 172 | - leave the copyright alone. |
| 173 | Note that pinyin.map, ziranma.cin (and hence the generated | ||
| 174 | leim/quail/PY.el, ZIRANMA.el) are under GPLv1 or later. | ||
| 167 | 175 | ||
| 168 | leim/SKK-DIC/SKK-JISYO.L | 176 | leim/SKK-DIC/SKK-JISYO.L |
| 169 | ja-dic/ja-dic.el | 177 | ja-dic/ja-dic.el |
| @@ -214,6 +222,11 @@ lwlib/ | |||
| 214 | rms (2007/02/17): "lwlib is not assigned to the FSF; we don't consider | 222 | rms (2007/02/17): "lwlib is not assigned to the FSF; we don't consider |
| 215 | it part of Emacs. [...] Therefore non-FSF copyrights are ok in lwlib." | 223 | it part of Emacs. [...] Therefore non-FSF copyrights are ok in lwlib." |
| 216 | 224 | ||
| 225 | Leave these files under GPLv1 or later. | ||
| 226 | [Note that lwlib.c and xlwmenu.c were installed in 1994 under GPLv2 or | ||
| 227 | later, but I reverted them to GPLv1 or later which I think is right | ||
| 228 | for the original lwlib/.] FIXME was this right? | ||
| 229 | |||
| 217 | FSF copyrights should only appear in files which have undergone | 230 | FSF copyrights should only appear in files which have undergone |
| 218 | non-trivial cumulative changes from the original versions in the Lucid | 231 | non-trivial cumulative changes from the original versions in the Lucid |
| 219 | Widget Library. NB this means that if you make non-trivial changes to | 232 | Widget Library. NB this means that if you make non-trivial changes to |
| @@ -512,6 +525,10 @@ etc/TUTORIAL* (translations) | |||
| 512 | Done: TUTORIAL.eo | 525 | Done: TUTORIAL.eo |
| 513 | 526 | ||
| 514 | 527 | ||
| 528 | lwlib/* | ||
| 529 | should it be under GPLv1 or later, or v2 or later? | ||
| 530 | |||
| 531 | |||
| 515 | 532 | ||
| 516 | This file is part of GNU Emacs. | 533 | This file is part of GNU Emacs. |
| 517 | 534 | ||