Mercurial > emacs
annotate admin/notes/copyright @ 106161:0ea716305b13
gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
add a blank entry so it doesn't collapse into nothing.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Fri, 20 Nov 2009 08:54:18 +0000 |
parents | 1ba696f077b7 |
children | 9018050eebac |
rev | line source |
---|---|
100971 | 1 Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. |
75776 | 2 See the end of the file for license conditions. |
75596 | 3 |
4 | |
75465 | 5 NOTES ON COPYRIGHTS AND LICENSES |
6 | |
7 Some terminology: | |
8 | |
9 A "copyright notice" consists of one or a few lines of this format: | |
10 "Copyright (C) 2006, 2007 Free Software Foundation, Inc." | |
11 | |
12 A "license notice" is a statement of permissions, and is usually much | |
13 longer, eg the text "GNU Emacs is free software...". | |
14 | |
15 | |
75967 | 16 Summary for the impatient: |
17 | |
76329 | 18 1. Don't add code to Emacs written by someone other than yourself |
76330 | 19 without thinking about the legal aspect. Even if the changes are |
20 trivial, consider if they combine with previous changes by the same | |
21 author to make a non-trivial total. If so, make sure they have an | |
22 assignment. If adding a whole file adjust the copyright statements in | |
23 the file. | |
75967 | 24 |
76330 | 25 2. When installing code written by someone else, the ChangeLog entry |
26 should be in the name of the author of the code, not the person who | |
27 installs it. I think it is helpful to put the author (if not yourself) | |
28 in the CVS log as well; and to not install any of your own changes in | |
29 the same commit. | |
76329 | 30 |
31 3. With images, add the legal info to a README file in the directory | |
75967 | 32 containing the image. |
33 | |
76329 | 34 4. If you add a lot of text to a previously trivial file that had no |
75967 | 35 legal notices, consider if you should add a copyright statement. |
36 | |
76329 | 37 5. Please don't just add an FSF copyright without checking that is the |
76194 | 38 right thing to do. |
39 | |
75967 | 40 |
75465 | 41 Every non-trivial file distributed through the Emacs CVS should be |
42 self-explanatory in terms of copyright and license. This includes | |
43 files that are not distributed in Emacs releases (for example, the | |
44 admin/ directory), because the whole Emacs CVS is publicly | |
45 available. | |
46 | |
47 The definition of triviality is a little vague, but a rule of thumb is | |
48 that any file with less than 15 lines of actual content is trivial. If | |
49 a file is auto-generated (eg ldefs-boot.el) from another one in the | |
50 CVS, then it does not really matter about adding a copyright statement | |
51 to the generated file. | |
52 | |
76011 | 53 Legal advice says that we could, if we wished, put a license notice |
54 even in trivial files, because copyright law in general looks at the | |
55 overall work as a whole. It is not _necessary_ to do so, and rms | |
56 prefers that we do not. This means one needs to take care that trivial | |
57 files do not grow and become non-trivial without having a license | |
58 added. NB consequently, if you add a lot of text to a small file, | |
59 consider whether your changes have made the file worthy of a copyright | |
60 notice, and if so, please add one. | |
75911 | 61 |
76213 | 62 It can be helpful to put a reminder comment at the start of a trivial |
63 file, eg: "add a license notice if this grows to > 10 lines of code". | |
64 | |
75465 | 65 The years in the copyright notice should be updated every year (see |
100973 | 66 file "years" in this directory). The PDF versions of refcards etc |
75465 | 67 should display copyright notices (an exception to the rule about |
68 "generated" files), but these can just display the latest year. The | |
69 full list of years should be kept in comments in the source file. If | |
70 these are distributed in CVS, check in a regenerated version when the | |
71 tex files are updated. | |
72 | |
73 Copyright changes should be propagated to any associated repositories | |
74 (eg Gnus, MH-E), but I think in every case this happens automatically | |
75 (?). | |
76 | |
75776 | 77 All README (and other such text files) that are non-trivial should |
78 contain copyright statements and GPL license notices, exactly as .el | |
75934 | 79 files do (see e.g. README in the top-level directory). Before 2007, |
75776 | 80 we used a simple, short statement permitting copying and modification |
81 provided legal notices were retained. In Feb 2007 we switched to the | |
75934 | 82 standard GPL text, on legal advice. Some older text files in etc/ |
83 should, however, keep their current licenses (see below for list). | |
75465 | 84 |
75776 | 85 For image files, the copyright and license details should be recorded |
86 in a README file in each directory with images. (Legal advice says | |
87 that we need not add notices to each image file individually, if they | |
75865 | 88 allow for that.). It is recommended to use the word "convert" to |
89 describe the automatic process of changing an image from one format to | |
90 another (http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00618.html). | |
91 | |
75465 | 92 |
93 When installing a file with an "unusual" license (after checking first | |
94 it is ok), put a copy of the copyright and license in the file (if | |
95 possible. It's ok if this makes the file incompatible with its | |
96 original format, if it can still be used by Emacs), or in a README | |
97 file in the relevant directory. | |
98 | |
99 The vast majority of files are copyright FSF and distributed under the | |
100 GPL. A few files (mainly related to language and charset support) are | |
101 copyright AIST alone, or both AIST and FSF. (Contact Kenichi Handa | |
102 with questions about legal issues in such files.) In all these cases, | |
103 the copyright years in each file should be updated each year. | |
104 | |
105 There are some exceptions to the points in the previous paragraph, and | |
106 these are listed below for reference, together with any files where | |
107 the copyright needs to be updated in "unusual" ways. | |
108 | |
109 If you find any other such cases, please consult to check they are ok, | |
110 and note them in this file. This includes missing copyright notices, | |
111 and "odd" copyright holders. In most cases, individual authors should | |
112 not appear in copyright statements. Either the copyright has been | |
113 assigned (check copyright.list) to the FSF (in which case the original | |
114 author should be removed and the year(s) transferred to the FSF); or | |
115 else it is possible the file should not be in Emacs at all (please | |
116 report!). | |
117 | |
75791 | 118 Note that it seems painfully clear that one cannot rely on CVS logs, |
119 or even ChangeLogs, for older changes. People often installed changes | |
120 from others, without recording the true authorship. | |
121 | |
75465 | 122 [For reference, most of these points were established via email with |
123 rms, 2007/1, "Copyright years".] | |
124 | |
125 | |
100904
bca7002cbd07
Update list of files affected by `set-copyright'.
Glenn Morris <rgm@gnu.org>
parents:
97752
diff
changeset
|
126 lisp/version.el # emacs-copyright |
bca7002cbd07
Update list of files affected by `set-copyright'.
Glenn Morris <rgm@gnu.org>
parents:
97752
diff
changeset
|
127 lib-src/ebrowse.c # version |
75596 | 128 lib-src/etags.c # print_version |
129 lib-src/rcs2log # Copyright | |
100904
bca7002cbd07
Update list of files affected by `set-copyright'.
Glenn Morris <rgm@gnu.org>
parents:
97752
diff
changeset
|
130 Cocoa/Emacs.base/Contents/Info.plist |
bca7002cbd07
Update list of files affected by `set-copyright'.
Glenn Morris <rgm@gnu.org>
parents:
97752
diff
changeset
|
131 Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings |
bca7002cbd07
Update list of files affected by `set-copyright'.
Glenn Morris <rgm@gnu.org>
parents:
97752
diff
changeset
|
132 GNUstep/Emacs.base/Resources/Info-gnustep.plist |
81230
488b6efe575f
Mention new function `set-copyright'.
Glenn Morris <rgm@gnu.org>
parents:
80911
diff
changeset
|
133 `set-copyright' in admin.el will do all the above. |
75596 | 134 |
75465 | 135 <top-level>/install-sh |
136 lispintro/install-sh | |
137 - this file is copyright MIT, which is OK. Leave the copyright alone. | |
138 | |
75911 | 139 src/m/news-r6.h |
75865 | 140 public domain, leave alone. |
141 | |
100973 | 142 etc/refcards/*.tex |
143 also update the \def\year macro for the latest year. | |
144 | |
76358 | 145 etc/BABYL, ms-kermit |
146 no notices (see below). | |
147 | |
75465 | 148 etc/edt-user.doc |
149 - update BOTH notices in this file | |
150 | |
76011 | 151 etc/emacs.csh |
76461 | 152 - written by Michael DeCorte, who has no assignment. But trivial |
153 enough to not need license. | |
76011 | 154 |
76220 | 155 etc/future-bug |
96370
74c47560c109
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
94831
diff
changeset
|
156 - doesn't need a humorless disclaimer, because Karl Fogel says we |
76220 | 157 can consider it part of Emacs, and he has a blanker disclaimer for |
158 Emacs changes. (email to rgm "[Emacs-commit] emacs/etc future-bug", | |
159 2007028) | |
160 | |
75865 | 161 etc/letter.pbm,letter.xpm |
75791 | 162 - trivial, no notice needed. |
75865 | 163 <http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00324.html> |
164 | |
75911 | 165 etc/FTP, ORDERS |
166 - trivial (at time of writing), no license needed | |
167 | |
75865 | 168 etc/GNU, INTERVIEW, LINUX-GNU, MOTIVATION, SERVICE, THE-GNU-PROJECT, |
169 WHY-FREE | |
170 rms: "These are statements of opinion or testimony. Their licenses | |
171 should permit verbatim copying only. Please don't change the | |
172 licenses that they have. They are distributed with Emacs but they | |
173 are not part of Emacs." | |
174 | |
76432 | 175 etc/HELLO |
176 standard notices. Just a note that although the file itself is not | |
76433 | 177 really copyrightable, in the wider context of it being part of |
76432 | 178 Emacs (and written by those with assignments), a standard notice is |
179 fine. | |
180 | |
75865 | 181 etc/MAILINGLISTS |
182 rms: simple license is fine for this file | |
75791 | 183 |
75539 | 184 leim/CXTERM-DIC/4Corner.tit, ARRAY30.tit, CCDOSPY.tit, ECDICT.tit, |
185 ETZY.tit, PY-b5.tit, Punct-b5.tit, Punct.tit, QJ-b5.tit, QJ.tit, | |
186 SW.tit, TONEPY.tit, ZOZY.tit | |
75465 | 187 - leave the copyrights alone. |
188 | |
189 leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns, | |
75539 | 190 pinyin.map, ziranma.cin |
75465 | 191 - leave the copyright alone. |
76220 | 192 Note that pinyin.map, ziranma.cin (and hence the generated |
193 leim/quail/PY.el, ZIRANMA.el) are under GPLv1 or later. | |
75465 | 194 |
195 leim/SKK-DIC/SKK-JISYO.L | |
196 ja-dic/ja-dic.el | |
197 (the latter is auto-generated from the former). Leave the copyright alone. | |
198 | |
199 lib-src/etags.c | |
76194 | 200 Copyright information is duplicated in etc/ETAGS.README. Update that |
201 file too. | |
202 | |
203 Until 2007 etags.c was described as being copyright FSF and Ken Arnold. | |
204 After some investigation in Feb 2007, then to the best of our | |
205 knowledge we believe that the original 1984 Emacs version was based | |
206 on the version in BSD4.2. See for example this 1985 post from Ken Arnold: | |
207 <http://groups.google.com/group/mod.sources/browse_thread/thread/ffe5c55845a640a9> | |
208 I have received enough requests for the current source to ctags | |
209 to post it. Here is the latest version (what will go out with | |
210 4.3, modulo any bugs fixed during the beta period). It is the | |
211 4.2 ctags with recognition of yacc and lex tags added. | |
212 | |
213 See also a 1984 version of ctags (no copyright) posted to net.sources: | |
214 <http://groups.google.com/group/net.sources/msg/a21b6c21be12a98d> | |
215 Version of etags.c in emacs-16.56 duplicates comment typos. | |
216 | |
217 Accordingly, in Feb 2007 we added a 1984 copyright for the | |
218 University of California and a revised BSD license. The terms of | |
219 this require that the full license details be available in binary | |
76243 | 220 distributions - hence the file etc/ETAGS.README. The fact that the |
221 --version output just says "Copyright <year> FSF" is apparently OK | |
222 from a legal point of view. | |
75465 | 223 |
224 lib-src/getopt1.c, getopt_int.h | |
225 - these are from the GNU C library. Leave the copyrights alone. | |
226 | |
75499 | 227 lisp/play/tetris.el |
228 - no special rules about the copyright. We note here that we believe | |
229 (2007/1) there is no problem with our use of the name "tetris" or | |
230 the concept. | |
231 rms: "My understanding is that game rules as such are not copyrightable." | |
232 <http://lists.gnu.org/archive/html/emacs-devel/2007-01/msg00960.html> | |
77696
b43e6f8f3e6e
Sync from trunk (though admin/ is not distributed, so this is not
Glenn Morris <rgm@gnu.org>
parents:
77609
diff
changeset
|
233 rms: Legal advice is that we are ok and need not worry about this. |
75499 | 234 |
75465 | 235 |
236 lisp/net/tramp.el | |
237 - there are also copyrights in the body of the file. Update these too. | |
238 | |
76194 | 239 |
75991 | 240 lwlib/ |
241 rms (2007/02/17): "lwlib is not assigned to the FSF; we don't consider | |
242 it part of Emacs. [...] Therefore non-FSF copyrights are ok in lwlib." | |
243 | |
76246 | 244 NB don't change the GPL version used for lwlib .c and .h files (see |
245 below). | |
246 | |
76194 | 247 FSF copyrights should only appear in files which have undergone |
248 non-trivial cumulative changes from the original versions in the Lucid | |
249 Widget Library. NB this means that if you make non-trivial changes to | |
250 a file with no FSF copyright, you should add one. Also, if changes are | |
251 reverted to the extent that a file becomes basically the same as the | |
252 original version, the FSF copyright should be removed. | |
253 | |
254 In my (rgm) opinion, as of Feb 2007, all the non-trivial files differ | |
255 significantly from the original versions, with the exception of | |
256 lwlib-Xm.h. Most of the changes that were made to this file have | |
257 subsequently been reverted. Therefore I removed the FSF copyright from | |
258 this file (which is arguably too trivial to merit a notice anyway). I | |
259 added FSF copyright to the following files which did not have them | |
260 already: Makefile.in, lwlib-Xaw.c, lwlib-int.h (borderline), | |
261 lwlib-utils.c (borderline), lwlib.c, lwlib.h. | |
262 | |
263 Copyright years before the advent of public CVS in 2001 were those | |
264 when I judged (from the CVS logs) that non-trivial amounts of change | |
265 had taken place. I also adjusted the existing FSF years in xlwmenu.c, | |
266 xlwmenu.h, and xlwmenuP.h on the same basis. | |
267 | |
268 Note that until Feb 2007, the following files in lwlib were lacking | |
269 notices: lwlib-int.h, lwlib.h, lwlib-Xaw.h, lwlib-Xlw.h, lwlib-utils.h | |
270 | |
271 The following files did not list a Lucid copyright: xlwmenu.h, | |
272 xlwmenuP.h. | |
273 | |
274 To the best of our knowledge, all the code files in lwlib were | |
275 originally part of the Lucid Widget Library, even if they did not say | |
276 so explicitly. For example, they were all present in Lucid Emacs 19.1 | |
277 in 1992. The exceptions are the two Xaw files, which did not appear | |
278 till Lucid Emacs 19.9 in 1994. The file lwlib-Xaw.h is too trivial to | |
279 merit a copyright notice, but would presumably have the same one as | |
280 lwlib-Xaw.c. We have been unable to find a true standalone version of | |
281 LWL, if there was such a thing, to check definitively. | |
282 | |
283 To clarify the situation, in Feb 2007 we added Lucid copyrights and | |
284 GPL notices to those files lacking either that were non-trivial, | |
285 namely: lwlib-int.h, lwlib.h, xlwmenu.h, xlwmenuP.h. This represents | |
286 our best understanding of the legal status of these files. We also | |
287 clarified the notices in Makefile.in, which was originally the | |
288 Makefile auto-generated from Lucid's Imakefile. | |
289 | |
290 As of Feb 2007, the following files are considered too trivial for | |
291 notices: lwlib-Xaw.h, lwlib-Xlw.h, lwlib-utils.h. | |
292 | |
76246 | 293 The version of lwlib/ first installed in Emacs seems to be the same as |
294 that used in Lucid Emacs 19.8 (released 6-sep-93); except the two Xaw | |
295 files, which did not appear till Athena support was added in Lucid | |
296 Emacs 19.9. In Lucid Emacs 19.1, all files were under GPLv1 or later, | |
297 but by Lucid Emacs 19.8, lwlib.c and xlwmenu.c had been switched to v2 | |
298 or later. These are the versions that were first installed in Emacs. | |
299 So in GNU Emacs, these two files have been under v2 or later since | |
300 1994. | |
76194 | 301 |
76246 | 302 It seems that it was the intention of Lucid to use v1 or later |
303 (excepting the two files mentioned previously); so this is the license | |
304 we have used when adding notices to code that did not have notices | |
305 originally. Although we have the legal right to switch to v2 or later, | |
306 rms prefers that we do not do so. | |
307 | |
308 | |
97752 | 309 doc/*/doclicense.texi |
310 - leave the copyright alone in this imported file. | |
311 | |
312 doc/*/*.texi - All manuals should be under GFDL (but see below), and | |
313 should include a copy of it, so that they can be distributed | |
314 separately. faq.texi has a different license, for some reason no-one | |
315 can remember. | |
77280 | 316 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00583.html |
317 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00618.html | |
318 | |
97752 | 319 doc/misc/mh-e.texi is dual-licensed (GPL and GFDL) per agreement with |
320 FSF (reconfirmed by rms Aug 25 2008). Discussion with | |
321 licensing@fsf.org starting on Thu, 07 Aug 2003 with subject: | |
322 "[gnu.org #58812] Changing license of MH-E manual" | |
323 | |
77280 | 324 |
76246 | 325 msdos/is_exec.c, sigaction.c - these files are copyright DJ Delorie. |
326 Leave the copyrights alone. Leave the Eli Zaretskii copyright in | |
327 is_exec.c alone. See the msdos/README file for the legal history of | |
328 these files. | |
75465 | 329 |
76194 | 330 |
331 oldXMenu/ | |
332 Keep the "copyright.h" method used by X11, rather than moving the | |
333 licenses into the files. Note that the original X10.h did not use | |
334 copyright.h, but had an explicit notice, which we retain. | |
335 | |
336 If you make non-trivial changes to a file which does not have an FSF | |
337 notice, add one and a GPL notice (as per Activate.c). If changes to a | |
338 file are reverted such that it becomes essentially the same as the | |
339 original X11 version, remove the FSF notice and GPL. | |
340 | |
341 Only the files which differ significantly from the original X11 | |
342 versions should have FSF copyright and GPL notices. At time of writing | |
343 (Feb 2007), this is: Activate.c, Create.c, Internal.c. I (rgm) | |
344 established this by diff'ing the current files against those in X11R1, | |
345 and when I found significant differences looking in the ChangeLog for | |
346 the years they originated (the CVS logs are truncated before 1999). I | |
347 therefore removed the FSF notices (added in 200x) from the other | |
348 files. There are some borderline cases IMO: AddSel.c, InsSel.c, | |
349 XMakeAssoc.c, XMenu.h. For these I erred on the side of NOT adding FSF | |
350 notices. | |
351 | |
352 With regards to whether the files we have changed should have GPL | |
353 added or not, rms says (2007-02-25, "oldXmenu issues"): | |
354 | |
355 It does not make much difference, because oldXmenu is obsolete | |
356 except for use in Emacs (and it is not normally used in Emacs any | |
357 more either). | |
358 | |
359 So, to make things simple, please put our changes under the GPL. | |
360 | |
361 insque.c had no copyright notice until 2005. The version of insque.c | |
362 added to Emacs 1992-01-27 is essentially the same as insremque.c added | |
363 to glic three days later by Roland McGrath, with an FSF copyright and | |
364 GPL, but no ChangeLog entry: | |
365 <http://sources.redhat.com/cgi-bin/cvsweb.cgi/~checkout~/libc/misc/insremque.c?\ | |
366 rev=1.1&cvsroot=glibc> | |
367 To the best of his recollection, McGrath (who has a copyright | |
368 assignment) was the author of this file (email from roland at frob.com | |
369 to rms, 2007-02-23, "Where did insque.c come from?"). The FSF | |
370 copyright and GPL in this file are therefore correct as far as we | |
371 understand it. | |
372 | |
373 Imakefile had no legal info in Feb 2007, but was obviously based on | |
374 the X11 version (which also had no explicit legal info). As it was | |
375 unused, I removed it. It would have the same MIT copyright as | |
376 Makefile.in does now. | |
377 | |
378 | |
75465 | 379 src/gmalloc.c |
75539 | 380 - contains numerous copyrights from the GNU C library. Leave them alone. |
381 | |
75766 | 382 src/acldef.h, chpdef.h, ndir.h |
75765 | 383 - see comments below. These files are OK to be released with Emacs |
384 22, but we may want to revisit them afterwards. | |
385 | |
386 | |
75911 | 387 ** Some notes on resolved issues, for historical information only |
388 | |
76461 | 389 etc/TERMS |
390 rms: "surely written either by me or by ESR. (If you can figure out | |
391 which year, I can probably tell you which.) Either way, we have papers | |
76470
208f30cfee6b
Update notes on etc/Xkeymap.txt and etc/TERMS
Chong Yidong <cyd@stupidchicken.com>
parents:
76461
diff
changeset
|
392 for it." It was present in Emacs-16.56 (15-jul-85). rms: "Then I |
208f30cfee6b
Update notes on etc/Xkeymap.txt and etc/TERMS
Chong Yidong <cyd@stupidchicken.com>
parents:
76461
diff
changeset
|
393 conclude it was written by me." |
76461 | 394 |
395 etc/ulimit.hack | |
396 Very obsolete file removed March 2007. Doesn't say who the author | |
397 is, but web-search suggests Karl Kleinpaste, who has no Emacs | |
398 assignment. Trivial anyway. | |
399 http://groups.google.com/group/comp.unix.shell/browse_thread/thread/bf3df496994\ | |
400 9f1df/7e5922c67b3a98fb | |
401 http://groups.google.com/group/comp.unix.questions/msg/cc7e49cacfd1ccb4 | |
402 (original 1987 source) | |
403 | |
75934 | 404 lisp/term/README |
405 - had no copyright notice till Feb 2007. ChangeLog.3 suggests it was | |
406 written by Eric Raymond. When asked by rms on 14 Feb 2007 he said: | |
407 | |
408 I don't remember writing it, but it reads like my prose and I believe | |
409 I wrote the feature(s) it's describing. So I would have been the | |
410 likeliest person to write it. | |
411 | |
412 Odds are that I did, but I'm not certain. | |
413 | |
414 Accordingly, FSF copyright was added. | |
415 | |
87595
4c6c79916238
* configure.in: Remove references to unsupported systems.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82141
diff
changeset
|
416 src/unexhp9k800.c |
77696
b43e6f8f3e6e
Sync from trunk (though admin/ is not distributed, so this is not
Glenn Morris <rgm@gnu.org>
parents:
77609
diff
changeset
|
417 http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html |
76678 | 418 - briefly removed due to legal uncertainly Jan-Mar 2007. The |
419 relevant assignment is under "hp9k800" in copyright.list. File was | |
420 written by John V. Morris at HP, and disclaimed by the author and | |
421 HP. So this file is public domain. | |
422 | |
75911 | 423 |
77135 | 424 K Rodgers changes |
425 It was pointed out that K Rodgers only had assigments for VC and | |
426 ps-print, but had changed several other files. We tried to contact | |
427 him for a general assignment, but he proved uncommunicative (despite | |
428 initially indicating to rms he would sign an assignment). As a result, his | |
429 changes were removed and/or rewritten independently. For details, see | |
430 threads: | |
431 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00225.html | |
432 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00257.html | |
433 | |
77609 | 434 But then an assignment arrived before the release of Emacs 22: |
435 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01427.html | |
436 | |
77135 | 437 |
77696
b43e6f8f3e6e
Sync from trunk (though admin/ is not distributed, so this is not
Glenn Morris <rgm@gnu.org>
parents:
77609
diff
changeset
|
438 lisp/progmodes/python.el |
b43e6f8f3e6e
Sync from trunk (though admin/ is not distributed, so this is not
Glenn Morris <rgm@gnu.org>
parents:
77609
diff
changeset
|
439 Dave Love alerted us to a potential legal problem: |
b43e6f8f3e6e
Sync from trunk (though admin/ is not distributed, so this is not
Glenn Morris <rgm@gnu.org>
parents:
77609
diff
changeset
|
440 http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html |
b43e6f8f3e6e
Sync from trunk (though admin/ is not distributed, so this is not
Glenn Morris <rgm@gnu.org>
parents:
77609
diff
changeset
|
441 |
b43e6f8f3e6e
Sync from trunk (though admin/ is not distributed, so this is not
Glenn Morris <rgm@gnu.org>
parents:
77609
diff
changeset
|
442 On consultation with a lawyer, we found there was no problem: |
b43e6f8f3e6e
Sync from trunk (though admin/ is not distributed, so this is not
Glenn Morris <rgm@gnu.org>
parents:
77609
diff
changeset
|
443 http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg00466.html |
b43e6f8f3e6e
Sync from trunk (though admin/ is not distributed, so this is not
Glenn Morris <rgm@gnu.org>
parents:
77609
diff
changeset
|
444 |
b43e6f8f3e6e
Sync from trunk (though admin/ is not distributed, so this is not
Glenn Morris <rgm@gnu.org>
parents:
77609
diff
changeset
|
445 |
75946 | 446 ** Issues that are "fixed" for the release of Emacs 22, but we may |
447 wish to revisit later in more detail | |
448 | |
449 | |
76037 | 450 admin/check-doc-strings |
451 File says it's in the public domain, but that might not make it so. | |
452 | |
76431 | 453 etc/BABYL |
454 File written long ago by authors with no assignment. Keep them | |
76358 | 455 without notices for now, try and contact authors if possible. Be |
456 ready to remove these files if the authors ever object. | |
76037 | 457 |
76431 | 458 etc/ms-kermit |
75989 | 459 etc/e/eterm-color.ti |
75946 | 460 src/acldef.h, chpdef.h, ndir.h |
461 On legal advice from Matt Norwood, the following comment was added | |
76431 | 462 to these files in Feb/Mar 2007: |
75946 | 463 |
464 The code here is forced by the interface, and is not subject to | |
465 copyright, constituting the only possible expression of the | |
466 algorithm in this format. | |
467 | |
468 With the addition of this notice, these files are OK for the | |
469 upcoming Emacs-22 release. Post-release, we can revisit this issue | |
470 and possibly add a list of all authors who have changed these files. | |
471 (details in email from Matt Norwood to rms, 2007/02/03). | |
472 | |
76461 | 473 etc/ms-7bkermit |
474 Says it was written by Andy Lowry and Joel Spolsky. No entry for | |
475 either in copyright.list. NB this file is not "constrained" like | |
476 ms-kermit (rms: "We know it isn't. A comment at the front says it has | |
477 other bindings which might be handy."). File removed March 2007. | |
478 Re-add if clear up status at some point. | |
479 | |
480 etc/Xkeymap.txt | |
481 No info on author. File removed March 2007. rms: "It says it is | |
482 RLK's way of remapping his keyboard, so it is not constrained. I think | |
483 it was written by RLK. Let's delete it; if we contact RLK again, we | |
76470
208f30cfee6b
Update notes on etc/Xkeymap.txt and etc/TERMS
Chong Yidong <cyd@stupidchicken.com>
parents:
76461
diff
changeset
|
484 can put it back." Actually, RLK == Robert Krawitz has an Emacs |
76617 | 485 assignment. So this could be restored if it is still useful, but Jan Djärv |
486 says it is obsolete: | |
487 <http://lists.gnu.org/archive/html/emacs-devel/2007-03/msg00673.html> | |
75946 | 488 |
489 src/m/mips4.h, news-risc.h, pmax.h | |
490 src/s/aix3-2.h, bsd386.h, hpux8.h, hpux9.h, irix4-0.h, irix5-0.h, | |
87595
4c6c79916238
* configure.in: Remove references to unsupported systems.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82141
diff
changeset
|
491 netbsd.h, sol2-3.h, usg5-4-2.h |
75946 | 492 - all these (not obviously trivial) files were missing copyrights |
493 till Feb 2007, when FSF copyright was added. Matt Norwood advised: | |
494 | |
495 For now, I think the best policy is to assume that we do have | |
496 assignments from the authors (I recall many of these header files | |
497 as having been originally written by rms), and to attach an FSF | |
498 copyright with GPL notice. We can amend this if and when we | |
499 complete the code audit. Any additions to these files by | |
500 non-assigned authors are arguably "de minimis" contributions to | |
501 Emacs: small changes or suggestions to a work that are subsumed in | |
502 the main authors' copyright in the entire work. | |
503 | |
504 Here is my (rgm) take on the details of the above files: | |
505 | |
506 mips4.h | |
507 might be trivial? started trivial, been added to in tiny changes by | |
508 those with FSF assignment, often result of email suggestions by others. | |
509 | |
510 news-risc.h | |
511 started trivial. Grown by tiny additions, plus chunk | |
512 from mips.h, which was and is Copyright FSF | |
513 | |
514 pmax.h | |
515 started trivial. grown in tiny changes, except for maybe Jim Wilson's | |
516 comment. | |
517 | |
518 ? irix4-0.h | |
519 I would say started non-trivial (1992, rms). only tiny changes since | |
520 installed. | |
521 | |
522 ? irix5-0.h | |
523 I would say started non-trivial (1993, jimb, heavily based | |
524 on irix4-0.h). A few borderline non-tiny changes since. | |
525 | |
526 usg5-4-2.h | |
527 started non-trivial, but was heavily based on usg5-4.h, which was and is | |
528 copyright FSF. only tiny changes since installed. | |
529 | |
530 sol2-3.h | |
531 started trivial. only non-tiny change (1994) incorporated code from | |
532 usg5-4.h, which was and is copyright FSF. | |
533 | |
87595
4c6c79916238
* configure.in: Remove references to unsupported systems.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82141
diff
changeset
|
534 aix3-2.h, bsd386.h, hpux8.h, hpux9.h, netbsd.h |
75946 | 535 started trivial, grown in tiny changes. |
536 | |
76011 | 537 netbsd.h: |
538 Roland McGrath said to rms (2007/02/17): "I don't really remember | |
539 anything about it. If I put it in without other comment, then probably | |
540 I wrote it myself." | |
541 | |
75946 | 542 |
75966 | 543 Someone might want to tweak the copyright years (for dates before |
544 2001) that I used in all these files. | |
545 | |
546 Note: erring on the side of caution, I also added notices to some | |
547 files I thought might be considered non-trivial (if one includes | |
548 comment) in s/: | |
87595
4c6c79916238
* configure.in: Remove references to unsupported systems.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82141
diff
changeset
|
549 aix4-1.h hpux10.h irix6-0.h irix6-5.h |
4c6c79916238
* configure.in: Remove references to unsupported systems.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82141
diff
changeset
|
550 ptx4.h sol2.h |
75966 | 551 |
552 (everything with > 30 non-blank lines, which at least is _some_ kind of | |
553 system) | |
554 | |
555 | |
75765 | 556 *** These are copyright issues that need not be fixed until after |
557 Emacs 22 is released (though if they can be fixed before, that is | |
558 obviously good): | |
559 | |
560 | |
561 Is it OK to just `cvs remove' a file for legal reasons, or is | |
562 something more drastic needed? A removed file is still available from | |
563 CVS, if suitable options are applied. (This CVS issue obviously does | |
564 not affect a release). | |
565 rms: will ask lawyer | |
566 | |
567 | |
75865 | 568 Make sure that all files with non-standard copyrights or licenses are |
569 noted in this file. | |
570 | |
571 | |
76034 | 572 REMOVED etc/gnu.xpm, nt/icons/emacs21.ico, nt/icons/sink.ico |
573 - Restore if find legal info. emacs21.ico is not due to Davenport. | |
77135 | 574 Geoff Voelker checked but could not find a record of where it came |
575 from. | |
76037 | 576 |
76034 | 577 |
75791 | 578 etc/images |
579 Image files from GTK, Gnome are under GPLv2 (no "or later"?). RMS will | |
580 contact image authors in regards to future switch to v3. | |
581 | |
75765 | 582 |
75926 | 583 etc/TUTORIAL* (translations) |
584 switch to GPL (see english TUTORIAL) | |
585 rms: "We can leave the TUTORIAL translations alone until their | |
586 maintainers update them." | |
76034 | 587 Can adapt short license text from end of GPL translations at: |
76012 | 588 http://www.gnu.org/licenses/translations.html |
76034 | 589 Only a few sentences around the license notice need changing from |
590 previous version. | |
591 Done: TUTORIAL.eo | |
75865 | 592 |
75465 | 593 |
76271 | 594 *** These are copyright issues still to be addressed: |
595 | |
77696
b43e6f8f3e6e
Sync from trunk (though admin/ is not distributed, so this is not
Glenn Morris <rgm@gnu.org>
parents:
77609
diff
changeset
|
596 None known. |
76271 | 597 |
598 | |
82141
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
599 ** NOTES ON RELICENSING TO GPL3 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
600 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
601 The EMACS_22_BASE branch was changed to GPLv3 (or later) 2007/07/25. |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
602 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
603 Some notes: |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
604 (see http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg01431.html) |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
605 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
606 1. There are some files in Emacs CVS which are not part of Emacs (eg |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
607 those included from Gnulib). These are all copyright FSF and (at time |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
608 of writing) GPL >= 2. rms says may as well leave the licenses of these |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
609 alone (may import them from Gnulib again). These are: |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
610 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
611 Gnulib: |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
612 src/getloadavg.c |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
613 src/gmalloc.c |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
614 src/md5.c |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
615 src/md5.h |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
616 src/mktime.c |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
617 src/strftime.c |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
618 src/termcap.c |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
619 src/tparam.c |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
620 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
621 Others: |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
622 config.guess |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
623 config.sub |
100961 | 624 doc/man/texinfo.tex |
82141
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
625 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
626 Note _not_ included in the above are src/regex.{c,h} (rms: "That |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
627 forked version is only in Emacs, so definitely relicense that."), and |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
628 oldXMenu/insque.c (rms: "We wrote that specifically for Emacs, so |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
629 definitely relicense that."). |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
630 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
631 2. The files that are copyright FSF and AIST, or AIST alone, should be |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
632 and were updated, ditto the oldXMenu files with FSF copyright, and |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
633 msdos/is_exec.c and sigaction.c. |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
634 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
635 3. lwlib/ |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
636 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
637 Files originally in Lucid Widget Library were left alone (excludes |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
638 ChangeLog, etc), ie remain under GPL v1 or later, or v2 or later. |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
639 (rms: "We may as well leave this alone, since we are never going to |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
640 change it much.") |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
641 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
642 4. There are some files where the FSF holds no copyright. These were |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
643 left alone: |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
644 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
645 leim/MISC-DIC/CTLau-b5.html >= v2 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
646 leim/MISC-DIC/CTLau.html >= v2 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
647 (above included in lisp/international/titdic-cnv.el) |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
648 leim/MISC-DIC/pinyin.map >= v1 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
649 leim/MISC-DIC/ziranma.cin >= v1 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
650 leim/SKK-DIC/SKK-JISYO.L >= v2 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
651 leim/SKK-DIC/README >= v2 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
652 leim/ja-dic/ja-dic.el >= v2 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
653 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
654 5. At time of writing, some non-Emacs icons included from Gnome remain |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
655 under GPLv2 (no "or later"). See: |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
656 |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
657 etc/images/gnus/README |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
658 etc/images/mail/README |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
659 etc/images/README |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
660 nt/icons/README |
b5f8f65b3576
Add notes on relicensing to GPLv3.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
661 |
75776 | 662 |
663 This file is part of GNU Emacs. | |
664 | |
94831
cac099ec0724
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
665 GNU Emacs is free software: you can redistribute it and/or modify |
75776 | 666 it under the terms of the GNU General Public License as published by |
94831
cac099ec0724
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
667 the Free Software Foundation, either version 3 of the License, or |
cac099ec0724
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
668 (at your option) any later version. |
75776 | 669 |
670 GNU Emacs is distributed in the hope that it will be useful, | |
671 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
672 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
673 GNU General Public License for more details. | |
674 | |
675 You should have received a copy of the GNU General Public License | |
94831
cac099ec0724
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
676 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |