On 06.01.2009 00:04, Uwe Hermann wrote:
On Mon, Jan 05, 2009 at 02:47:15AM +0100, Carl-Daniel Hailfinger wrote:
The flashrom man page has incomplete author/copyright sections and an incorrect license section.
- Remove the copyright listings and refer the reader to the source files.
ACK, this is a pita to keep up-to-date in many places (README, manpage, wiki, source, whatever). The only authoritative place for (C) lines is (and should be) the source code.
- Update the author list to those which have copyright messages in the
source files.
- Correct the license from GPL v2+ to GPL v2.
That's not quite correct / complete. I'd use a text such as this:
Flashrom is licensed under the terms of the GNU General Public License (GPL). Some files are licensed under the "GPL (version 2, or any later version)", and some files are licensed under the "GPL, version 2".
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: flashrom-manpage/flashrom.8
--- flashrom-manpage/flashrom.8 (Revision 3811) +++ flashrom-manpage/flashrom.8 (Arbeitskopie) @@ -1,4 +1,4 @@ -.TH FLASHROM 8 "June 22, 2008" +.TH FLASHROM 8 "January 5, 2009" .SH NAME flashrom - a universal BIOS/ROM/flash programming utility .SH SYNOPSIS @@ -84,22 +84,51 @@ .RB "(" http://coreboot.org/Mailinglist ")." .SH LICENCE .B flashrom -is covered by the GNU General Public License (GPL), version 2 or later. +is covered by the GNU General Public License (GPL), version 2. .SH COPYRIGHT -2000 Silicon Integrated System Corporation .br -2003 Niki W. Waibel -.br -2004 Tyan Corp -.br -2005-2007 coresystems GmbH +Please see the individual files. .SH AUTHORS Yinghai Lu yinghai.lu@amd.com .br Stefan Reinauer stepan@coresystems.de .br -Niki W. Waibel niki.waibel@gmx.net +Ronald G. Minnich rminnich@gmail.com .br +Steven James pyro@linuxlabs.com +.br +Giampiero Giancipoli gianci@email.it +.br +Uwe Hermann uwe@hermann-uwe.de +.br
+2008 Carl-Daniel Hailfinger
Drop this...
Done.
+.br +Luc Verhaegen libv@skynet.be +.br +Carl-Daniel Hailfinger
... as this line is also there.
Also, are the entries in some order? Maybe sort alphabetically? This is what we do in superiotool, I think.
Done.
Thanks for the review!
Regards, Carl-Daniel
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: flashrom-manpage/flashrom.8 =================================================================== --- flashrom-manpage/flashrom.8 (Revision 3847) +++ flashrom-manpage/flashrom.8 (Arbeitskopie) @@ -1,4 +1,4 @@ -.TH FLASHROM 8 "June 22, 2008" +.TH FLASHROM 8 "January 5, 2009" .SH NAME flashrom - a universal BIOS/ROM/flash programming utility .SH SYNOPSIS @@ -84,22 +84,50 @@ .RB "(" http://coreboot.org/Mailinglist ")." .SH LICENCE .B flashrom -is covered by the GNU General Public License (GPL), version 2 or later. +is covered by the GNU General Public License (GPL), version 2. Some files are +additionally available under the GPL (version 2, or any later version). .SH COPYRIGHT -2000 Silicon Integrated System Corporation .br -2003 Niki W. Waibel +Please see the individual files. +.SH AUTHORS +Carl-Daniel Hailfinger .br -2004 Tyan Corp +Claus Gindhart claus.gindhart@kontron.com .br -2005-2007 coresystems GmbH -.SH AUTHORS -Yinghai Lu yinghai.lu@amd.com +Dominik Geyer dominik.geyer@kontron.com .br +Eric Biederman ebiederman@lnxi.com +.br +Giampiero Giancipoli gianci@email.it +.br +Joe Bao Zheng.Bao@amd.com +.br +Luc Verhaegen libv@skynet.be +.br +Markus Boas ryven@ryven.de +.br +Nikolay Petukhov nikolay.petukhov@gmail.com +.br +Peter Stuge peter@stuge.se +.br +Reinder E.N. de Haan lb_reha@mveas.com +.br +Ronald G. Minnich rminnich@gmail.com +.br +Ronald Hoogenboom ronald@zonnet.nl +.br Stefan Reinauer stepan@coresystems.de .br -Niki W. Waibel niki.waibel@gmx.net +Stefan Wildemann stefan.wildemann@kontron.com .br +Steven James pyro@linuxlabs.com +.br +Uwe Hermann uwe@hermann-uwe.de +.br +Wang Qingpei Qingpei.Wang@amd.com +.br +Yinghai Lu yinghai.lu@amd.com +.br some others .PP This manual page was written by Uwe Hermann uwe@hermann-uwe.de.