On Fri, Feb 13, 2009 at 08:03:14AM -0700, Jim Walker wrote: > Marcel Telka wrote: >> On Thu, Feb 12, 2009 at 08:10:34PM +0100, Marcel Telka wrote: >>> I updated the webrev with (hopefully) all of your valuable suggestions: >>> http://cr.opensolaris.org/~aragorn/6787900/ >> >> I just realized I forgot to update copyright files. >> The webrev is updated. > > You can reduce things down to this. You don't need to repeat > license headers in the copyright file since you have the > full license. Short is sweet :)
I agree, but the current approach is simpler. Reasons: 1. I leverage the previous mutt 1.5.17 integration. :-) 2. The current license files are constructed in this way: cat usr/src/cmd/mutt/mutt-1.5.19/COPYRIGHT usr/src/cmd/mutt/mutt-1.5.19/GPL plus there is a header on top of the copyright file saying: <cut> For the avoidance of doubt, except that if any license choice other than GPL or LGPL is available it will apply instead, Sun elects to use only the General Public License version 2 (GPLv2) at this time for any software where a choice of GPL license versions is made available with the language indicating that GPLv2 or any later version may be used, or where a choice of which version of the GPL is applied is otherwise unspecified. ==================================================================== </cut> But if you do not like this approach I could change both copyright files. No problem. Just say :-). > > Cheers, > Jim > > 1 For the avoidance of doubt, except that if any license choice other > 2 than GPL or LGPL is available it will apply instead, Sun elects to > 3 use only the General Public License version 2 (GPLv2) at this time > 4 for any software where a choice of GPL license versions is made > 5 available with the language indicating that GPLv2 or any later > 6 version may be used, or where a choice of which version of the GPL > 7 is applied is otherwise unspecified. > 8 ==================================================================== > 9 > 18 Copyright (C) 1996-2007 Michael R. Elkins <me at cs.hmc.edu> > 19 Copyright (C) 1996-2002 Brandon Long <blong at fiction.net> > 20 Copyright (C) 1997-2008 Thomas Roessler <roessler at does-not-exist.org> > 21 Copyright (C) 1998-2005 Werner Koch <wk at isil.d.shuttle.de> > 22 Copyright (C) 1999-2009 Brendan Cully <brendan at kublai.com> > 23 Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen at iki.fi> > 24 Copyright (C) 2000-2004 Edmund Grimley Evans <edmundo at rano.org> > 25 Copyright (C) 2006-2008 Rocco Rutte <pdmef at gmx.net> > 26 > 42 GNU GENERAL PUBLIC LICENSE > 43 Version 2, June 1991 -- Marcel Telka Solaris RPE
