summaryrefslogtreecommitdiffstats
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:49 +0100
commit7cd2ac0e40d854bab9a32512018aff6172500c0e (patch)
tree99366a7b07db9f0b53bb9d411f0016f36982616d /meta/files/common-licenses/Libpng
parent879a7f819b7f38cda82d97489af433310aabfed1 (diff)
downloadpoky-7cd2ac0e40d854bab9a32512018aff6172500c0e.tar.gz
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. (From OE-Core rev: e47343d12ee571281238bbf5663b074c0e32049f) Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 ce3ddb0264..a9d5b031b0 100644
--- a/meta/files/common-licenses/Libpng
+++ b/meta/files/common-licenses/Libpng
@@ -1,5 +1,5 @@
1 1
2This copy of the libpng notices is provided for your convenience. In case of 2This copy of the libpng notices is provided for your convenience. In case of
3any discrepancy between this copy and the notices in the file png.h that is 3any discrepancy between this copy and the notices in the file png.h that is
4included in the libpng distribution, the latter shall prevail. 4included in the libpng distribution, the latter shall prevail.
5 5
@@ -15,65 +15,63 @@ Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
15distributed according to the same disclaimer and license as libpng-1.2.5 15distributed according to the same disclaimer and license as libpng-1.2.5
16with the following individual added to the list of Contributing Authors 16with the following individual added to the list of Contributing Authors
17 17
18Cosmin Truta 18 Cosmin Truta
19 19
20libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are 20libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
21Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are 21Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
22distributed according to the same disclaimer and license as libpng-1.0.6 22distributed according to the same disclaimer and license as libpng-1.0.6
23with the following individuals added to the list of Contributing Authors 23with the following individuals added to the list of Contributing Authors
24 24
25Simon-Pierre Cadieux 25 Simon-Pierre Cadieux
26Eric S. Raymond 26 Eric S. Raymond
27Gilles Vollant 27 Gilles Vollant
28 28
29and with the following additions to the disclaimer: 29and with the following additions to the disclaimer:
30 30
31There is no warranty against interference with your enjoyment of the 31 There is no warranty against interference with your enjoyment of the
32library or against infringement. There is no warranty that our 32 library or against infringement. There is no warranty that our
33efforts or the library will fulfill any of your particular purposes 33 efforts or the library will fulfill any of your particular purposes
34or needs. This library is provided with all faults, and the entire 34 or needs. This library is provided with all faults, and the entire
35risk of satisfactory quality, performance, accuracy, and effort is with 35 risk of satisfactory quality, performance, accuracy, and effort is with
36the user. 36 the user.
37 37
38libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are 38libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
39Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are 39Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
40distributed according to the same disclaimer and license as libpng-0.96, 40distributed according to the same disclaimer and license as libpng-0.96,
41with the following individuals added to the list of Contributing Authors: 41with the following individuals added to the list of Contributing Authors:
42 42
43Tom Lane 43 Tom Lane
44Glenn Randers-Pehrson 44 Glenn Randers-Pehrson
45Willem van Schaik 45 Willem van Schaik
46 46
47libpng versions 0.89, June 1996, through 0.96, May 1997, are 47libpng versions 0.89, June 1996, through 0.96, May 1997, are
48Copyright (c) 1996, 1997 Andreas Dilger 48Copyright (c) 1996, 1997 Andreas Dilger
49Distributed according to the same disclaimer and license as libpng-0.88, 49Distributed according to the same disclaimer and license as libpng-0.88,
50with the following individuals added to the list of Contributing Authors: 50with the following individuals added to the list of Contributing Authors:
51 51
52John Bowler 52 John Bowler
53Kevin Bracey 53 Kevin Bracey
54Sam Bushell 54 Sam Bushell
55Magnus Holmgren 55 Magnus Holmgren
56Greg Roelofs 56 Greg Roelofs
57Tom Tanner 57 Tom Tanner
58 58
59libpng versions 0.5, May 1995, through 0.88, January 1996, are 59libpng versions 0.5, May 1995, through 0.88, January 1996, are
60Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. 60Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
61 61
62For the purposes of this copyright and license, "Contributing 62For the purposes of this copyright and license, "Contributing Authors"
63Authors"
64is defined as the following set of individuals: 63is defined as the following set of individuals:
65 64
66Andreas Dilger 65 Andreas Dilger
67Dave Martindale 66 Dave Martindale
68Guy Eric Schalnat 67 Guy Eric Schalnat
69Paul Schmidt 68 Paul Schmidt
70Tim Wegner 69 Tim Wegner
71 70
72The PNG Reference Library is supplied "AS IS". The Contributing 71The PNG Reference Library is supplied "AS IS". The Contributing Authors
73Authors
74and Group 42, Inc. disclaim all warranties, expressed or implied, 72and Group 42, Inc. disclaim all warranties, expressed or implied,
75including, without limitation, the warranties of merchantability and of 73including, without limitation, the warranties of merchantability and of
76fitness for any purpose. The Contributing Authors and Group 42, Inc. 74fitness for any purpose. The Contributing Authors and Group 42, Inc.
77assume no liability for direct, indirect, incidental, special, exemplary, 75assume no liability for direct, indirect, incidental, special, exemplary,
78or consequential damages, which may result from the use of the PNG 76or consequential damages, which may result from the use of the PNG
79Reference Library, even if advised of the possibility of such damage. 77Reference Library, even if advised of the possibility of such damage.
@@ -85,37 +83,30 @@ to the following restrictions:
851. The origin of this source code must not be misrepresented. 831. The origin of this source code must not be misrepresented.
86 84
872. Altered versions must be plainly marked as such and must not 852. Altered versions must be plainly marked as such and must not
88be misrepresented as being the original source. 86 be misrepresented as being the original source.
89 87
903. This Copyright notice may not be removed or altered from any 883. This Copyright notice may not be removed or altered from any
91source or altered source distribution. 89 source or altered source distribution.
92 90
93The Contributing Authors and Group 42, Inc. specifically permit, without 91The Contributing Authors and Group 42, Inc. specifically permit, without
94fee, and encourage the use of this source code as a component to 92fee, and encourage the use of this source code as a component to
95supporting the PNG file format in commercial products. If you use this 93supporting the PNG file format in commercial products. If you use this
96source code in a product, acknowledgment is not required but would be 94source code in a product, acknowledgment is not required but would be
97appreciated. 95appreciated.
98 96
99 97
100A "png_get_copyright" function is available, for convenient use in 98A "png_get_copyright" function is available, for convenient use in "about"
101"about"
102boxes and the like: 99boxes and the like:
103 100
104printf("%s",png_get_copyright(NULL)); 101 printf("%s",png_get_copyright(NULL));
105 102
106Also, the PNG logo (in PNG format, of course) is supplied in the 103Also, the PNG logo (in PNG format, of course) is supplied in the
107files "pngbar.png" and "pngbar.jpg (88x31) and 104files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
108"pngnow.png" (98x31).
109 105
110Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a 106Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a
111certification mark of the Open Source Initiative. 107certification mark of the Open Source Initiative.
112 108
113Glenn Randers-Pehrson 109Glenn Randers-Pehrson
114glennrp at users.sourceforge.net 110glennrp at users.sourceforge.net
115December 9, 2010 111December 9, 2010
116 112
117
118
119
120
121