summaryrefslogtreecommitdiff
path: root/meta/files/common-licenses/Libpng
diff options
context:
space:
mode:
authorBeth Flanagan <elizabeth.flanagan@intel.com>2011-06-15 13:52:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 23:44:29 +0100
commite47343d12ee571281238bbf5663b074c0e32049f (patch)
treeaa434dae7245a5748f2158c212f654b90cb22e01 /meta/files/common-licenses/Libpng
parent319610d5bf61108f2ecc538c7a5de5b7c85a6684 (diff)
downloadopenembedded-core-e47343d12ee571281238bbf5663b074c0e32049f.tar.gz
openembedded-core-e47343d12ee571281238bbf5663b074c0e32049f.tar.bz2
openembedded-core-e47343d12ee571281238bbf5663b074c0e32049f.tar.xz
openembedded-core-e47343d12ee571281238bbf5663b074c0e32049f.zip
common-licenses: Additions and corrections
I've added more licenses from SPDX and corrected the gcc license so that it is a. parsable and b. accurate to the SPDX standard. I've also done some cleanup of license text and gdb's LICENSE field. Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Diffstat (limited to 'meta/files/common-licenses/Libpng')
-rw-r--r--meta/files/common-licenses/Libpng79
1 files changed, 35 insertions, 44 deletions
diff --git a/meta/files/common-licenses/Libpng b/meta/files/common-licenses/Libpng
index ce3ddb026..a9d5b031b 100644
--- a/meta/files/common-licenses/Libpng
+++ b/meta/files/common-licenses/Libpng
@@ -1,5 +1,5 @@
-This copy of the libpng notices is provided for your convenience. In case of
+This copy of the libpng notices is provided for your convenience. In case of
any discrepancy between this copy and the notices in the file png.h that is
included in the libpng distribution, the latter shall prevail.
@@ -15,65 +15,63 @@ Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
-Cosmin Truta
+ Cosmin Truta
libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.0.6
with the following individuals added to the list of Contributing Authors
-Simon-Pierre Cadieux
-Eric S. Raymond
-Gilles Vollant
+ Simon-Pierre Cadieux
+ Eric S. Raymond
+ Gilles Vollant
and with the following additions to the disclaimer:
-There is no warranty against interference with your enjoyment of the
-library or against infringement. There is no warranty that our
-efforts or the library will fulfill any of your particular purposes
-or needs. This library is provided with all faults, and the entire
-risk of satisfactory quality, performance, accuracy, and effort is with
-the user.
+ There is no warranty against interference with your enjoyment of the
+ library or against infringement. There is no warranty that our
+ efforts or the library will fulfill any of your particular purposes
+ or needs. This library is provided with all faults, and the entire
+ risk of satisfactory quality, performance, accuracy, and effort is with
+ the user.
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-0.96,
with the following individuals added to the list of Contributing Authors:
-Tom Lane
-Glenn Randers-Pehrson
-Willem van Schaik
+ Tom Lane
+ Glenn Randers-Pehrson
+ Willem van Schaik
libpng versions 0.89, June 1996, through 0.96, May 1997, are
Copyright (c) 1996, 1997 Andreas Dilger
Distributed according to the same disclaimer and license as libpng-0.88,
with the following individuals added to the list of Contributing Authors:
-John Bowler
-Kevin Bracey
-Sam Bushell
-Magnus Holmgren
-Greg Roelofs
-Tom Tanner
+ John Bowler
+ Kevin Bracey
+ Sam Bushell
+ Magnus Holmgren
+ Greg Roelofs
+ Tom Tanner
libpng versions 0.5, May 1995, through 0.88, January 1996, are
Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
-For the purposes of this copyright and license, "Contributing
-Authors"
+For the purposes of this copyright and license, "Contributing Authors"
is defined as the following set of individuals:
-Andreas Dilger
-Dave Martindale
-Guy Eric Schalnat
-Paul Schmidt
-Tim Wegner
+ Andreas Dilger
+ Dave Martindale
+ Guy Eric Schalnat
+ Paul Schmidt
+ Tim Wegner
-The PNG Reference Library is supplied "AS IS". The Contributing
-Authors
+The PNG Reference Library is supplied "AS IS". The Contributing Authors
and Group 42, Inc. disclaim all warranties, expressed or implied,
including, without limitation, the warranties of merchantability and of
-fitness for any purpose. The Contributing Authors and Group 42, Inc.
+fitness for any purpose. The Contributing Authors and Group 42, Inc.
assume no liability for direct, indirect, incidental, special, exemplary,
or consequential damages, which may result from the use of the PNG
Reference Library, even if advised of the possibility of such damage.
@@ -85,37 +83,30 @@ to the following restrictions:
1. The origin of this source code must not be misrepresented.
2. Altered versions must be plainly marked as such and must not
-be misrepresented as being the original source.
+ be misrepresented as being the original source.
3. This Copyright notice may not be removed or altered from any
-source or altered source distribution.
+ source or altered source distribution.
The Contributing Authors and Group 42, Inc. specifically permit, without
fee, and encourage the use of this source code as a component to
-supporting the PNG file format in commercial products. If you use this
+supporting the PNG file format in commercial products. If you use this
source code in a product, acknowledgment is not required but would be
appreciated.
-A "png_get_copyright" function is available, for convenient use in
-"about"
+A "png_get_copyright" function is available, for convenient use in "about"
boxes and the like:
-printf("%s",png_get_copyright(NULL));
+ printf("%s",png_get_copyright(NULL));
Also, the PNG logo (in PNG format, of course) is supplied in the
-files "pngbar.png" and "pngbar.jpg (88x31) and
-"pngnow.png" (98x31).
+files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
-Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a
+Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a
certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
December 9, 2010
-
-
-
-
-