Merge from emacs-23

[bpt/emacs.git] / admin / notes / copyright

diff --git a/admin/notes/copyright b/admin/notes/copyright
index f4ceb27..cb1c4e0 100644 (file)
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,4 +1,4 @@
-Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -132,10 +132,16 @@ 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.
 
-<top-level>/install-sh
-lispintro/install-sh
+configure
+ - copyright FSF, with unlimited permission to copy, distribute and modify
+
+m4/getopt.m4
+ - copyright FSF, with MIT-like license
+
+install-sh
  - this file is copyright MIT, which is OK. Leave the copyright alone.
 
+mkinstalldirs
 src/m/news-r6.h
   public domain, leave alone.
 
@@ -221,6 +227,11 @@ lib-src/etags.c
 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
+   from authors other than himself were negligible.
+
 lisp/play/tetris.el
   - no special rules about the copyright. We note here that we believe
   (2007/1) there is no problem with our use of the name "tetris" or
@@ -324,6 +335,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
@@ -606,6 +620,7 @@ of writing) GPL >= 2. rms says may as well leave the licenses of these
 alone (may import them from Gnulib again). These are:
 
     Gnulib:
+    move-if-change
     src/getloadavg.c
     src/gmalloc.c
     src/md5.c