From 5fccc3c4b79da9232fbe6f69dcab404bac4e2e7a Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Thu, 4 Aug 2016 01:50:45 +0200 Subject: Resolve #282: COPYING vs. docs/naturaldocs/license.txt Basically, docs/naturaldocs/license.txt is a duplicate of COPYING, which is going to be used only by Natural Docs. We remove the file and generate it on the fly instead; also we adjust COPYING to make it easier to obtain a pleasing result without sacrificing COPYING's readability. The diff is best viewed with whitespace changes ignored. --- COPYING | 137 ++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 72 insertions(+), 65 deletions(-) (limited to 'COPYING') diff --git a/COPYING b/COPYING index 2354c82..725d1b5 100644 --- a/COPYING +++ b/COPYING @@ -1,66 +1,73 @@ - - Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004 by Cold Spring Harbor Laboratory. Funded under - Grant P41-RR02188 by the National Institutes of Health. - - Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004 by Boutell.Com, Inc. - - Portions relating to GD2 format copyright 1999, 2000, 2001, 2002, - 2003, 2004 Philip Warner. - - Portions relating to PNG copyright 1999, 2000, 2001, 2002, 2003, - 2004 Greg Roelofs. - - Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002, - 2003, 2004 John Ellson (ellson@graphviz.org). - - Portions relating to gdft.c copyright 2001, 2002, 2003, 2004 John - Ellson (ellson@graphviz.org). - - Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 - Pierre-Alain Joye (pierre@libgd.org). - - Portions relating to JPEG and to color quantization copyright - 2000, 2001, 2002, 2003, 2004, Doug Becker and copyright (C) 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Thomas - G. Lane. This software is based in part on the work of the - Independent JPEG Group. See the file README-JPEG.TXT for more - information. - - Portions relating to GIF compression copyright 1989 by Jef - Poskanzer and David Rowley, with modifications for thread safety - by Thomas Boutell. - - Portions relating to GIF decompression copyright 1990, 1991, 1993 - by David Koblas, with modifications for thread safety by Thomas - Boutell. - - Portions relating to WBMP copyright 2000, 2001, 2002, 2003, 2004 - Maurice Szmurlo and Johan Van den Brande. - - Portions relating to GIF animations copyright 2004 Jaakko Hyvätti - (jaakko.hyvatti@iki.fi) - - Permission has been granted to copy, distribute and modify gd in - any context without fee, including a commercial application, - provided that this notice is present in user-accessible supporting - documentation. - - This does not affect your ownership of the derived work itself, - and the intent is to assure proper credit for the authors of gd, - not to interfere with your productive use of gd. If you have - questions, ask. "Derived works" includes all programs that utilize - the library. Credit must be given in user-accessible - documentation. - - This software is provided "AS IS." The copyright holders disclaim - all warranties, either express or implied, including but not - limited to implied warranties of merchantability and fitness for a - particular purpose, with respect to this code and accompanying - documentation. - - Although their code does not appear in the current release, the - authors wish to thank David Koblas, David Rowley, and Hutchison - Avenue Software Corporation for their prior contributions. +Credits and license terms: + +In order to resolve any possible confusion regarding the authorship of +gd, the following copyright statement covers all of the authors who +have required such a statement. If you are aware of any oversights in +this copyright notice, please contact Pierre-A. Joye who will be +pleased to correct them. + +* Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004 by Cold Spring Harbor Laboratory. Funded under + Grant P41-RR02188 by the National Institutes of Health. + +* Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, + 2004 by Boutell.Com, Inc. + +* Portions relating to GD2 format copyright 1999, 2000, 2001, 2002, + 2003, 2004 Philip Warner. + +* Portions relating to PNG copyright 1999, 2000, 2001, 2002, 2003, + 2004 Greg Roelofs. + +* Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002, + 2003, 2004 John Ellson (ellson@graphviz.org). + +* Portions relating to gdft.c copyright 2001, 2002, 2003, 2004 John + Ellson (ellson@graphviz.org). + +* Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Pierre-Alain Joye (pierre@libgd.org). + +* Portions relating to JPEG and to color quantization copyright + 2000, 2001, 2002, 2003, 2004, Doug Becker and copyright (C) 1994, + 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Thomas + G. Lane. This software is based in part on the work of the + Independent JPEG Group. See the file README-JPEG.TXT for more + information. + +* Portions relating to GIF compression copyright 1989 by Jef + Poskanzer and David Rowley, with modifications for thread safety + by Thomas Boutell. + +* Portions relating to GIF decompression copyright 1990, 1991, 1993 + by David Koblas, with modifications for thread safety by Thomas + Boutell. + +* Portions relating to WBMP copyright 2000, 2001, 2002, 2003, 2004 + Maurice Szmurlo and Johan Van den Brande. + +* Portions relating to GIF animations copyright 2004 Jaakko Hyvätti + (jaakko.hyvatti@iki.fi) + +Permission has been granted to copy, distribute and modify gd in +any context without fee, including a commercial application, +provided that this notice is present in user-accessible supporting +documentation. + +This does not affect your ownership of the derived work itself, +and the intent is to assure proper credit for the authors of gd, +not to interfere with your productive use of gd. If you have +questions, ask. "Derived works" includes all programs that utilize +the library. Credit must be given in user-accessible +documentation. + +This software is provided "AS IS." The copyright holders disclaim +all warranties, either express or implied, including but not +limited to implied warranties of merchantability and fitness for a +particular purpose, with respect to this code and accompanying +documentation. + +Although their code does not appear in the current release, the +authors wish to thank David Koblas, David Rowley, and Hutchison +Avenue Software Corporation for their prior contributions. -- cgit v1.2.1