aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2011-01-07 11:23:35 -0800
committerPaul Eggert2011-01-07 11:23:35 -0800
commitdfa36fa1a299536e0414ab4a862e808eb0ccf2ab (patch)
tree8ec19a66638f8562702fdd6c425ed8cf0ab10cef /admin
parent8c51d2a2c2dcae4e54a7e5aa7543a3ecb8d7d886 (diff)
downloademacs-dfa36fa1a299536e0414ab4a862e808eb0ccf2ab.tar.gz
emacs-dfa36fa1a299536e0414ab4a862e808eb0ccf2ab.zip
* 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.
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog6
-rw-r--r--admin/notes/copyright10
2 files changed, 16 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 1314438a10a..d008c14e5f4 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
12011-01-02 Paul Eggert <eggert@cs.ucla.edu>
2
3 * notes/copyright: Report status more accurately for non-GPL files.
4 Report copyright status more accurately for mkinstalldirs,
5 configure, m4/getopt.m4, and msdos/sed*.inp.
6
12011-01-02 Eli Zaretskii <eliz@gnu.org> 72011-01-02 Eli Zaretskii <eliz@gnu.org>
2 8
3 * nt/README.W32: Update the information about PNG support libraries. 9 * 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
132GNUstep/Emacs.base/Resources/Info-gnustep.plist 132GNUstep/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
135configure
136 - copyright FSF, with unlimited permission to copy, distribute and modify
137
138m4/getopt.m4
139 - copyright FSF, with MIT-like license
140
135<top-level>/install-sh 141<top-level>/install-sh
136lispintro/install-sh 142lispintro/install-sh
137 - this file is copyright MIT, which is OK. Leave the copyright alone. 143 - this file is copyright MIT, which is OK. Leave the copyright alone.
138 144
145mkinstalldirs
139src/m/news-r6.h 146src/m/news-r6.h
140 public domain, leave alone. 147 public domain, leave alone.
141 148
@@ -329,6 +336,9 @@ Leave the copyrights alone. Leave the Eli Zaretskii copyright in
329is_exec.c alone. See the msdos/README file for the legal history of 336is_exec.c alone. See the msdos/README file for the legal history of
330these files. 337these files.
331 338
339msdos/sed*.inp - These files are copyright FSF and distributed under
340an MIT-like license.
341
332 342
333oldXMenu/ 343oldXMenu/
334 Keep the "copyright.h" method used by X11, rather than moving the 344 Keep the "copyright.h" method used by X11, rather than moving the