From 5aa27cc9be1a406b4d62219cde67713099c8c229 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 14 Feb 2007 03:16:04 +0000 Subject: [PATCH] *** empty log message *** --- admin/notes/copyright | 53 +++++++++++++++++++++++++++++++++++++------ etc/ChangeLog | 4 ++++ etc/images/gud/README | 47 ++++++++++++++++++++++++++------------ 3 files changed, 83 insertions(+), 21 deletions(-) diff --git a/admin/notes/copyright b/admin/notes/copyright index 8d982c49905..b4e5e142274 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -49,6 +49,11 @@ files: "trivial" components working together in some coherent system might be protectible. +RMS feels, though, that in trivial files (eg etc/FTP), having a +license notice looks odd. Matt Norwood has confirmed it is not +_necessary_ to have licenses in such files, so we are sticking with +the policy of no licenses in "trivial" files. + The years in the copyright notice should be updated every year (see file "years" in this directory). The PS versions of refcards etc should display copyright notices (an exception to the rule about @@ -71,7 +76,10 @@ standard GPL text, on legal advice.) For image files, the copyright and license details should be recorded in a README file in each directory with images. (Legal advice says that we need not add notices to each image file individually, if they -allow for that.) +allow for that.). It is recommended to use the word "convert" to +describe the automatic process of changing an image from one format to +another (http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00618.html). + When installing a file with an "unusual" license (after checking first it is ok), put a copy of the copyright and license in the file (if @@ -116,19 +124,29 @@ src/emacs.c - remember to change the latest copyright year in the --version output. [Post-release, will automate this like set-version does for version.] -admin/check-doc-strings - Author is Martin Buchholz, and the program output says it is in the - public domain. - /install-sh lispintro/install-sh - this file is copyright MIT, which is OK. Leave the copyright alone. +admin/check-doc-strings + public domain, leave alone. + etc/edt-user.doc - update BOTH notices in this file -etc/letter.pbm.letter.xpm +etc/letter.pbm,letter.xpm - trivial, no notice needed. + + +etc/GNU, INTERVIEW, LINUX-GNU, MOTIVATION, SERVICE, THE-GNU-PROJECT, +WHY-FREE + rms: "These are statements of opinion or testimony. Their licenses + should permit verbatim copying only. Please don't change the + licenses that they have. They are distributed with Emacs but they + are not part of Emacs." + +etc/MAILINGLISTS + rms: simple license is fine for this file leim/CXTERM-DIC/4Corner.tit, ARRAY30.tit, CCDOSPY.tit, ECDICT.tit, ETZY.tit, PY-b5.tit, Punct-b5.tit, Punct.tit, QJ-b5.tit, QJ.tit, @@ -197,6 +215,10 @@ not affect a release). rms: will ask lawyer +Make sure that all files with non-standard copyrights or licenses are +noted in this file. + + REMOVED etc/orgcard.tex, orgcard.ps Re-add these files if an assignment is received from Rooke. @@ -251,12 +273,22 @@ notice in each image (where the format allows it). It's OK to put the information in a README file in the associated directory. Files can be listed in groups. See etc/README for an example. Image files to consider: - etc/images/gnus/bar, dead, gnus kill-group, reverse-smile, rot13 + etc/images/gnus/bar, dead, gnus, kill-group, reverse-smile, rot13 etc/images/smilies/ rms: "Can you find this by searching for items in copyright.list that assign images for Emacs?" [this suggests we ask Bill Wohler] +etc/gnus-logo.eps, gnus-booklet.ps, gnus-refcard.ps + just to be safe, papers are on the way for the "Gnus logo", even + though it is very similar to the already-assigned "Emacs logo". + + +etc/emacs.csh (+ maybe other files rgm switched to GPL?) + does rms want the older, simple license for this put back? If so, + what about emacs.bash? + + etc/ms-kermit - no copyright, but ms-7bkermit has one etc/e/eterm-color.ti - no copyright rms: "I think that is not copyrightable under the merger doctrine @@ -267,6 +299,10 @@ For the above files, mail sent from rms to Matthew Norwood asking what to do (via Eben Moglen), 2007/1/22 ("Copyright years"). +etc/TUTORIAL* + switch to GPL, or keep older license? + + lib-src/etags.c - no 'k.* arnold' in copyright.list' rms: "That is ok, in principle. I used free code released by Ken Arnold as the starting point. However, it may be that we need to get @@ -302,6 +338,9 @@ The current legal advice seems to be that we should attach FSF copyright and GPL for the time being, then review post-release. But it is still under discussion. +Is/was there a file that we _do_ have copyright for, from which +src/s/umips.h was originally derived? + This file is part of GNU Emacs. diff --git a/etc/ChangeLog b/etc/ChangeLog index 60953364ce4..ddd25551e0a 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2007-02-14 Glenn Morris + + * OTHER.EMACSES: Remove obsolete file. + 2007-02-13 Chong Yidong * cs-refcard.tex (versionemacs): New macro. diff --git a/etc/images/gud/README b/etc/images/gud/README index 109607d4623..aaceaf38c25 100644 --- a/etc/images/gud/README +++ b/etc/images/gud/README @@ -1,7 +1,36 @@ -The following icons are derived from Redhat's Insight Debugger -(Windows style icon set in src/gdb/gdbtk/library/images2) -Copyright (C) 1997, 1998, 1999, 2000, 2001 - Red Hat, Inc. +COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES + +The following icons were created by Nick Roberts . +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 + Free Software Foundation, Inc. +License: GNU General Public License version 2 or later (see COPYING) + + break.pbm, nexti.pbm, go.pbm, pp.pbm, print.pbm, pstar.pbm, remove.pbm + break.xpm, nexti.xpm, go.xpm, pp.xpm, print.xpm, pstar.xpm, remove.xpm + stepi.pbm, until.pbm + stepi.xpm, until.xpm + + +The following icons are derived from Red Hat's Insight Debugger: + + +"Insight is a graphical user interface to GDB, the GNU Debugger" + + +"Insight is being released under the terms of the GNU General Public +License (GPL)" + +In addition to the above, Red Hat has assigned (2002-11-09) copyright +for its work on GDB to the Free Software Foundation. In an email +exchange with Richard Stallman in November 2002, Red +Hat confirmed that their copyright assignment included the icons. + + +The following icons are derived from the Insight Windows style icon +set in src/gdb/gdbtk/library/images2. + +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 + Free Software Foundation, Inc. License: GNU General Public License version 2 or later (see COPYING) cont.pbm and cont.xpm were converted from continue.gif @@ -13,13 +42,3 @@ License: GNU General Public License version 2 or later (see COPYING) stop.pbm and stop.xpm were converted from stop.gif up.pbm and up.xpm were converted from up.gif watch.pbm and watch.xpm were converted from watch.gif - -The following icons were created by Nick Roberts . -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 - Free Software Foundation, Inc. -License: GNU General Public License version 2 or later (see COPYING) - - break.pbm, nexti.pbm, go.pbm, pp.pbm, print.pbm, pstar.pbm, remove.pbm - break.xpm, nexti.xpm, go.xpm, pp.xpm, print.xpm, pstar.xpm, remove.xpm - stepi.pbm, until.pbm - stepi.xpm, until.xpm