From e8c53d3abf2f23dc40ed2bc748678025d5b5a5bc Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 9 Jan 2011 00:42:24 -0800 Subject: [PATCH] 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. --- admin/ChangeLog | 11 +++++++++++ admin/notes/copyright | 24 ++++++++++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 07ed0179db..0e0d9f2e0d 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,14 @@ +2011-01-09 Paul Eggert + + 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. + 2011-01-07 Paul Eggert * notes/copyright: There's only one install-sh, not two, so fix a diff --git a/admin/notes/copyright b/admin/notes/copyright index 174d124f39..430192482b 100644 --- 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 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 -- 2.20.1