diff options
| author | Paul Eggert | 2011-01-09 00:42:24 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-09 00:42:24 -0800 |
| commit | e8c53d3abf2f23dc40ed2bc748678025d5b5a5bc (patch) | |
| tree | 61f48fa7e91a54cad2dc137826c19f07d171a7a9 /admin/notes | |
| parent | 803059b950b16957496e81b1cd12143e33775e3e (diff) | |
| download | emacs-e8c53d3abf2f23dc40ed2bc748678025d5b5a5bc.tar.gz emacs-e8c53d3abf2f23dc40ed2bc748678025d5b5a5bc.zip | |
Update copyright notes to match recent gnulib-related changes.
* notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
arg-nonnull.h, c++defs.h, compile, depcomp, missing,
warn-on-use.h, lib/*.[ch], lib/gnulib.mk. Remove src/mktime.c,
lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and
are subsumed by the lib/*.[ch] rule). Remove m4/getopt.m4 (now
subsumed by m4/*.m4 rule). config.guess, config.sub, and
doc/man/texinfo.tex are now copied in from gnulib.
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/copyright | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright index 174d124f39d..430192482b0 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright | |||
| @@ -132,10 +132,12 @@ Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings | |||
| 132 | GNUstep/Emacs.base/Resources/Info-gnustep.plist | 132 | GNUstep/Emacs.base/Resources/Info-gnustep.plist |
| 133 | `set-copyright' in admin.el will do all the above. | 133 | `set-copyright' in admin.el will do all the above. |
| 134 | 134 | ||
| 135 | aclocal.m4 | ||
| 135 | configure | 136 | configure |
| 137 | m4/*.m4 | ||
| 136 | - copyright FSF, with unlimited permission to copy, distribute and modify | 138 | - copyright FSF, with unlimited permission to copy, distribute and modify |
| 137 | 139 | ||
| 138 | m4/getopt.m4 | 140 | lib/Makefile.in |
| 139 | - copyright FSF, with MIT-like license | 141 | - copyright FSF, with MIT-like license |
| 140 | 142 | ||
| 141 | install-sh | 143 | install-sh |
| @@ -224,9 +226,6 @@ lib-src/etags.c | |||
| 224 | --version output just says "Copyright <year> FSF" is apparently OK | 226 | --version output just says "Copyright <year> FSF" is apparently OK |
| 225 | from a legal point of view. | 227 | from a legal point of view. |
| 226 | 228 | ||
| 227 | lib-src/getopt1.c, getopt_int.h | ||
| 228 | - these are from the GNU C library. Leave the copyrights alone. | ||
| 229 | |||
| 230 | lisp/cedet/semantic/imenu.el | 229 | lisp/cedet/semantic/imenu.el |
| 231 | - See http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00410.html | 230 | - See http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00410.html |
| 232 | in which Eric Ludlam established that the remaining contributions | 231 | in which Eric Ludlam established that the remaining contributions |
| @@ -620,21 +619,26 @@ of writing) GPL >= 2. rms says may as well leave the licenses of these | |||
| 620 | alone (may import them from Gnulib again). These are: | 619 | alone (may import them from Gnulib again). These are: |
| 621 | 620 | ||
| 622 | Gnulib: | 621 | Gnulib: |
| 622 | arg-nonnull.h | ||
| 623 | c++defs.h | ||
| 624 | compile | ||
| 625 | config.guess | ||
| 626 | config.sub | ||
| 627 | depcomp | ||
| 628 | doc/man/texinfo.tex | ||
| 629 | missing | ||
| 623 | move-if-change | 630 | move-if-change |
| 631 | warn-on-use.h | ||
| 632 | lib/*.[ch] | ||
| 633 | lib/gnulib.mk | ||
| 624 | src/getloadavg.c | 634 | src/getloadavg.c |
| 625 | src/gmalloc.c | 635 | src/gmalloc.c |
| 626 | src/md5.c | 636 | src/md5.c |
| 627 | src/md5.h | 637 | src/md5.h |
| 628 | src/mktime.c | ||
| 629 | src/strftime.c | 638 | src/strftime.c |
| 630 | src/termcap.c | 639 | src/termcap.c |
| 631 | src/tparam.c | 640 | src/tparam.c |
| 632 | 641 | ||
| 633 | Others: | ||
| 634 | config.guess | ||
| 635 | config.sub | ||
| 636 | doc/man/texinfo.tex | ||
| 637 | |||
| 638 | Note _not_ included in the above are src/regex.{c,h} (rms: "That | 642 | Note _not_ included in the above are src/regex.{c,h} (rms: "That |
| 639 | forked version is only in Emacs, so definitely relicense that."), and | 643 | forked version is only in Emacs, so definitely relicense that."), and |
| 640 | oldXMenu/insque.c (rms: "We wrote that specifically for Emacs, so | 644 | oldXMenu/insque.c (rms: "We wrote that specifically for Emacs, so |