From: Paul Eggert Date: Fri, 7 Jan 2011 19:23:35 +0000 (-0800) Subject: * notes/copyright: Report status more accurately for non-GPL files. X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~275^2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dfa36fa1a299536e0414ab4a862e808eb0ccf2ab;p=emacs.git * notes/copyright: Report status more accurately for non-GPL files. Report copyright status more accurately for mkinstalldirs, configure, m4/getopt.m4, and msdos/sed*.inp. --- diff --git a/admin/ChangeLog b/admin/ChangeLog index 1314438a10a..d008c14e5f4 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,9 @@ +2011-01-02 Paul Eggert + + * notes/copyright: Report status more accurately for non-GPL files. + Report copyright status more accurately for mkinstalldirs, + configure, m4/getopt.m4, and msdos/sed*.inp. + 2011-01-02 Eli Zaretskii * nt/README.W32: Update the information about PNG support libraries. diff --git a/admin/notes/copyright b/admin/notes/copyright index e0389212304..02aa3ba79c6 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -132,10 +132,17 @@ 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. +configure + - copyright FSF, with unlimited permission to copy, distribute and modify + +m4/getopt.m4 + - copyright FSF, with MIT-like license + /install-sh lispintro/install-sh - this file is copyright MIT, which is OK. Leave the copyright alone. +mkinstalldirs src/m/news-r6.h public domain, leave alone. @@ -329,6 +336,9 @@ Leave the copyrights alone. Leave the Eli Zaretskii copyright in is_exec.c alone. See the msdos/README file for the legal history of these files. +msdos/sed*.inp - These files are copyright FSF and distributed under +an MIT-like license. + oldXMenu/ Keep the "copyright.h" method used by X11, rather than moving the