gd copyright notice to be on the safe side

git-svn-id: svn://tug.org/texlive/trunk@18133 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 130 insertions, 27 deletions

diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index 7be04222638..5805c4d6ad5 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-01  Karl Berry  <karl@tug.org>
+
+	* dvipng.texi: include full gd copyright notice; seems the
+	safe thing to do.
+
 2010-04-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* dvipng.test: Check results from running kpsewhich.
diff --git a/Build/source/texk/dvipng/doc/dvipng.info b/Build/source/texk/dvipng/doc/dvipng.info
index 2eacd09e3e6..5f5a66fef70 100644
--- a/Build/source/texk/dvipng/doc/dvipng.info
+++ b/Build/source/texk/dvipng/doc/dvipng.info
@@ -1,6 +1,5 @@
-This is ../../../../tex-live-2010-02-01/texk/dvipng/doc/dvipng.info,
-produced by makeinfo version 4.13 from
-../../../../tex-live-2010-02-01/texk/dvipng/doc/dvipng.texi.
+This is ../../../../texk/dvipng/doc/dvipng.info, produced by makeinfo
+version 4.13 from ../../../../texk/dvipng/doc/dvipng.texi.
 
 INFO-DIR-SECTION TeX
 START-INFO-DIR-ENTRY
@@ -955,6 +954,70 @@ Ridderstro"m, Ezra Peisach, William H Wheeler, Thomas Klausner, Harald
 Koenig, Adrian Bunk, Kevin Smith, Jason Riedy, Wolfram Krause, Reinhard
 Kotucha, Takeshi Abe, and Waldeck Schutzer.
 
+   Use of the `gd' library requires inclusion of the following
+copyright notice, which applies to the `gd' library:
+
+     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 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
+     Hyva"dtti (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 Hutchison Avenue Software Corporation
+     for their prior contributions.
+
 
 File: dvipng.info,  Node: Copying,  Next: Index,  Prev: Credits,  Up: Top
 
@@ -1062,29 +1125,29 @@ Index
 
 
 Tag Table:
-Node: Top393
-Node: Introduction1288
-Node: Installation3527
-Node: Prerequisites3874
-Node: Configure6364
-Node: Build/install8403
-Node: Installation outside the texmf tree8871
-Node: Advice for non-privileged users9578
-Node: Basic usage10586
-Node: Command-line options11713
-Node: Option summary12137
-Node: Option details14446
-Node: Graphics29908
-Node: Encapsulated PostScript30473
-Node: Bitmapped graphics31816
-Node: Color33016
-Node: Color specifications33404
-Node: Color specials34503
-Node: Diagnosing problems35915
-Node: Contact information36398
-Node: Debug options37139
-Node: Credits38174
-Node: Copying39378
-Node: Index40158
+Node: Top353
+Node: Introduction1248
+Node: Installation3487
+Node: Prerequisites3834
+Node: Configure6324
+Node: Build/install8363
+Node: Installation outside the texmf tree8831
+Node: Advice for non-privileged users9538
+Node: Basic usage10546
+Node: Command-line options11673
+Node: Option summary12097
+Node: Option details14406
+Node: Graphics29868
+Node: Encapsulated PostScript30433
+Node: Bitmapped graphics31776
+Node: Color32976
+Node: Color specifications33364
+Node: Color specials34463
+Node: Diagnosing problems35875
+Node: Contact information36358
+Node: Debug options37099
+Node: Credits38134
+Node: Copying42135
+Node: Index42915
 
 End Tag Table
diff --git a/Build/source/texk/dvipng/doc/dvipng.texi b/Build/source/texk/dvipng/doc/dvipng.texi
index 3e8249fa9f7..b48a2419955 100644
--- a/Build/source/texk/dvipng/doc/dvipng.texi
+++ b/Build/source/texk/dvipng/doc/dvipng.texi
@@ -901,6 +901,41 @@ William H Wheeler, Thomas Klausner, Harald Koenig, Adrian Bunk, Kevin
 Smith, Jason Riedy, Wolfram Krause, Reinhard Kotucha, Takeshi Abe, and
 Waldeck Schutzer.
 
+Use of the @code{gd} library requires inclusion of the following
+copyright notice, which applies to the @code{gd} library:
+
+@quotation
+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 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@"adtti (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 Hutchison Avenue Software Corporation for their prior contributions. 
+@end quotation
+
 @ifset man
 @c man begin NOTES
 The full manual is accessible in the info format, on most systems by typing