-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
See the end of the file for license conditions.
2. When installing code written by someone else, the ChangeLog entry
should be in the name of the author of the code, not the person who
-installs it. I think it is helpful to put the author (if not yourself)
-in the CVS log as well; and to not install any of your own changes in
-the same commit.
+installs it. I think it is helpful to put the author (if not yourself)
+in the commit log as well (you can also use bzr commit's "--author"
+option); and to not install any of your own changes in the same commit.
3. With images, add the legal info to a README file in the directory
containing the image.
right thing to do.
-Every non-trivial file distributed through the Emacs CVS should be
+Every non-trivial file distributed through the Emacs repository should be
self-explanatory in terms of copyright and license. This includes
files that are not distributed in Emacs releases (for example, the
-admin/ directory), because the whole Emacs CVS is publicly
+admin/ directory), because the whole Emacs repository is publicly
available.
The definition of triviality is a little vague, but a rule of thumb is
that any file with less than 15 lines of actual content is trivial. If
a file is auto-generated (eg ldefs-boot.el) from another one in the
-CVS, then it does not really matter about adding a copyright statement
-to the generated file.
+repository, then it does not really matter about adding a copyright
+statement to the generated file.
Legal advice says that we could, if we wished, put a license notice
even in trivial files, because copyright law in general looks at the
file, eg: "add a license notice if this grows to > 10 lines of code".
The years in the copyright notice should be updated every year (see
-file "years" in this directory). The PS versions of refcards etc
+file "years" in this directory). The PDF versions of refcards etc
should display copyright notices (an exception to the rule about
"generated" files), but these can just display the latest year. The
full list of years should be kept in comments in the source file. If
-these are distributed in CVS, check in a regenerated version when the
-tex files are updated.
+these are distributed in the repository, check in a regenerated
+version when the tex files are updated.
Copyright changes should be propagated to any associated repositories
(eg Gnus, MH-E), but I think in every case this happens automatically
else it is possible the file should not be in Emacs at all (please
report!).
-Note that it seems painfully clear that one cannot rely on CVS logs,
+Note that it seems painfully clear that one cannot rely on commit logs,
or even ChangeLogs, for older changes. People often installed changes
from others, without recording the true authorship.
rms, 2007/1, "Copyright years".]
+lisp/version.el # emacs-copyright
+lib-src/ebrowse.c # version
lib-src/etags.c # print_version
lib-src/rcs2log # Copyright
-lisp/calc/calc-help.el # calc-full-help
-lisp/startup.el # fancy-splash-tail
-mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
-mac/src/Emacs.r # resource 'vers'
-src/emacs.c
- - remember to change the latest copyright year in the --version output.
+Cocoa/Emacs.base/Contents/Info.plist
+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.
+etc/refcards/*.tex
+ also update the \def\year macro for the latest year.
+
etc/BABYL, ms-kermit
no notices (see below).
-etc/edt-user.doc
- - update BOTH notices in this file
-
etc/emacs.csh
- written by Michael DeCorte, who has no assignment. But trivial
enough to not need license.
etc/future-bug
- - doesn't need a humourless disclaimer, because Karl Fogel says we
+ - doesn't need a humorless disclaimer, because Karl Fogel says we
can consider it part of Emacs, and he has a blanker disclaimer for
Emacs changes. (email to rgm "[Emacs-commit] emacs/etc future-bug",
2007028)
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
<http://lists.gnu.org/archive/html/emacs-devel/2007-01/msg00960.html>
rms: Legal advice is that we are ok and need not worry about this.
-lispref/doclicense.texi
-man/doclicense.texi
- - leave the copyright alone in this imported file.
lisp/net/tramp.el
- there are also copyrights in the body of the file. Update these too.
rms prefers that we do not do so.
-man/*.texi - All manuals should be under GFDL, and should include a
-copy of it, so that they can be distributed separately. faq.texi has
-a different license, for some reason no-one can remember.
+doc/*/doclicense.texi
+ - leave the copyright alone in this imported file.
+
+doc/*/*.texi - All manuals should be under GFDL (but see below), and
+should include a copy of it, so that they can be distributed
+separately. faq.texi has a different license, for some reason no-one
+can remember.
http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00583.html
http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00618.html
+doc/misc/mh-e.texi is dual-licensed (GPL and GFDL) per agreement with
+FSF (reconfirmed by rms Aug 25 2008). Discussion with
+licensing@fsf.org starting on Thu, 07 Aug 2003 with subject:
+"[gnu.org #58812] Changing license of MH-E manual"
+
msdos/is_exec.c, sigaction.c - these files are copyright DJ Delorie.
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
Accordingly, FSF copyright was added.
-src/unexhp9k800.c (and dependent src/m/sr2k.h)
+src/unexhp9k800.c
http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html
- briefly removed due to legal uncertainly Jan-Mar 2007. The
relevant assignment is under "hp9k800" in copyright.list. File was
src/m/mips4.h, news-risc.h, pmax.h
src/s/aix3-2.h, bsd386.h, hpux8.h, hpux9.h, irix4-0.h, irix5-0.h,
-isc2-2.h, netbsd.h, osf1.h, sol2-3.h, sunos4-0.h, usg5-4-2.h
+netbsd.h, sol2-3.h, usg5-4-2.h
- all these (not obviously trivial) files were missing copyrights
till Feb 2007, when FSF copyright was added. Matt Norwood advised:
I would say started non-trivial (1993, jimb, heavily based
on irix4-0.h). A few borderline non-tiny changes since.
-? isc2-2.h
- started trivial. 2 non-tiny change, in 1993. looks to
- be made up of several small tweaks from various sources. maybe
- non-tiny total changes from Karl Berry (no emacs assignment).
-
-osf1.h
- started trivial. grown in tiny changes (one borderline tiny change
- by fx in 2000, but most code was later removed). non-tiny addition
- in 2002 from m/alpha.h, but that was and is copyright FSF.
-
usg5-4-2.h
started non-trivial, but was heavily based on usg5-4.h, which was and is
copyright FSF. only tiny changes since installed.
started trivial. only non-tiny change (1994) incorporated code from
usg5-4.h, which was and is copyright FSF.
-aix3-2.h, bsd386.h, hpux8.h, hpux9.h, netbsd.h, sunos4-0.h
+aix3-2.h, bsd386.h, hpux8.h, hpux9.h, netbsd.h
started trivial, grown in tiny changes.
netbsd.h:
Note: erring on the side of caution, I also added notices to some
files I thought might be considered non-trivial (if one includes
comment) in s/:
- aix4-1.h hiuxmpp.h hiuxwe2.h hpux10.h irix6-0.h irix6-5.h isc3-0.h
- ptx4.h sol2.h sunos4-0.h
+ aix4-1.h hpux10.h irix6-0.h irix6-5.h
+ ptx4.h sol2.h
(everything with > 30 non-blank lines, which at least is _some_ kind of
system)
obviously good):
-Is it OK to just `cvs remove' a file for legal reasons, or is
+Is it OK to just `bzr remove' a file for legal reasons, or is
something more drastic needed? A removed file is still available from
-CVS, if suitable options are applied. (This CVS issue obviously does
-not affect a release).
+the repository, if suitable options are applied. (This issue obviously
+does not affect a release).
rms: will ask lawyer
Some notes:
(see http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg01431.html)
-1. There are some files in Emacs CVS which are not part of Emacs (eg
+1. There are some files in the Emacs tree which are not part of Emacs (eg
those included from Gnulib). These are all copyright FSF and (at time
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
Others:
config.guess
config.sub
- lispintro/missing
- man/texinfo.tex
+ 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
\f
This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
HCoop / bpt / emacs.git / blobdiff