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.

2 files changed, 1 insertions, 75 deletions

diff --git a/docs/naturaldocs/license.txt b/docs/naturaldocs/license.txt
deleted file mode 100644
index e9b6db0..0000000
--- a/docs/naturaldocs/license.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-Title: License
-
-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 also wish to thank David Koblas, David Rowley, and Hutchison
-> Avenue Software Corporation for their prior contributions.
diff --git a/docs/naturaldocs/run_docs.sh b/docs/naturaldocs/run_docs.sh
index 07baac6..0bc3ae3 100755
--- a/docs/naturaldocs/run_docs.sh
+++ b/docs/naturaldocs/run_docs.sh
@@ -60,7 +60,7 @@ mkdir tmp
 perl nobgd.pl ../../src/ tmp/
 
 # Add the external docs.
-cp license.txt tmp/
+echo "Title: License" | cat - ../../COPYING > tmp/license.txt
 sed -e "s/@VERSION@/$VERSION/g" preamble.txt > tmp/preamble.txt
 # ^^^ hack to get the version number in the docs.