Merge from mainline.

[gnu-emacs] / admin / notes / copyright

diff --git a/admin/notes/copyright b/admin/notes/copyright
index cb1c4e0b0e89f9e7aeca278cdc78e0eeace83f59..bee8a50b3ed9c062dbb29e842094c372da713721 100644 (file)
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -132,10 +132,12 @@ Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
 GNUstep/Emacs.base/Resources/Info-gnustep.plist
    `set-copyright' in admin.el will do all the above.
 
+aclocal.m4
 configure
+m4/*.m4
  - copyright FSF, with unlimited permission to copy, distribute and modify
 
-m4/getopt.m4
+lib/Makefile.in
  - copyright FSF, with MIT-like license
 
 install-sh
@@ -224,9 +226,6 @@ lib-src/etags.c
   --version output just says "Copyright <year> FSF" is apparently OK
   from a legal point of view.
 
-lib-src/getopt1.c, getopt_int.h
-  - these are from the GNU C library. Leave the copyrights alone.
-
 lisp/cedet/semantic/imenu.el
   - See http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00410.html
    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
 alone (may import them from Gnulib again). These are:
 
     Gnulib:
+    arg-nonnull.h
+    c++defs.h
+    compile
+    config.guess
+    config.sub
+    depcomp
+    doc/man/texinfo.tex
+    missing
     move-if-change
+    warn-on-use.h
+    lib/*.[ch]
+    lib/gnulib.mk
     src/getloadavg.c
     src/gmalloc.c
     src/md5.c
     src/md5.h
-    src/mktime.c
     src/strftime.c
     src/termcap.c
     src/tparam.c
 
-    Others:
-    config.guess
-    config.sub
-    doc/man/texinfo.tex
-
 Note _not_ included in the above are src/regex.{c,h} (rms: "That
 forked version is only in Emacs, so definitely relicense that."), and
 oldXMenu/insque.c (rms: "We wrote that specifically for Emacs, so