harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Mark Hindess" <mark.hind...@googlemail.com>
Subject [general] License fixes for M11?
Date Wed, 26 Aug 2009 23:06:47 GMT

I'd like to apply the appended patch to update the LICENSE files to
bring them in to line with the versions of lcms and libpng that are
being statically linked by the windows build.  The patch also corrects
the details for ICU4J which was upgraded from 4.0 to 4.2.1.

Do any other committers approve this change?

For the record, the libpng LICENSE file states:

  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.

And as it happens there is a discrepancy in the section:

 libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
 Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-0.96,

the year 2000 from the copyright in the LICENSE file.  So I took the
version from the png.h file for inclusion in our LICENSE file.

I feel a little guilty since I should have checked these after modifying
the dependencies a fortnight ago.  But feel less guilty since it turns
out they were already inaccurate even before my changes.

We really need a better way to handle dependency licenses.

Regards,
 Mark.

Index: LICENSE
===================================================================
--- LICENSE	(revision 807222)
+++ LICENSE	(working copy)
@@ -262,14 +262,14 @@
 
 
 
-License Notice for ICU4J version 4.0
-====================================
+License Notice for ICU4J version 4.2.1
+======================================
 
 ICU4J license - ICU4J 1.8.1 and later
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright (c) 1995-2008 International Business Machines Corporation and others 
+Copyright (c) 1995-2009 International Business Machines Corporation and others 
 
 All rights reserved. 
 
@@ -516,7 +516,7 @@
 This distribution may contain software that is based in part on Little cms
 for which the following notice applies:
 
-Copyright (C) 1998-2004 Marti Maria
+Copyright (c) 1998-2007 Marti Maria Saguer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -546,12 +546,67 @@
 Notice for libpng
 =================
 
-This distribution may contain software that is based in part on libpng v1.2.10
-for which the following notice applies:
+This distribution may contain software that is based in part on libpng
+v1.2.38 for which the following notice applies:
 
-Copyright (c) 2004, 2006 Glenn Randers-Pehrson
+libpng versions 1.2.6, August 15, 2004, through 1.2.38, July 16, 2009, are
+Copyright (c) 2004, 2006-2009 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
 
+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
+
+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.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998, 1999, 2000 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
+
+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
+
+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"
+is defined as the following set of individuals:
+
+   Andreas Dilger
+   Dave Martindale
+   Guy Eric Schalnat
+   Paul Schmidt
+   Tim Wegner
+
 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
@@ -560,13 +615,6 @@
 or consequential damages, which may result from the use of the PNG
 Reference Library, even if advised of the possibility of such damage.
 
-   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.
-
 Permission is hereby granted to use, copy, modify, and distribute this
 source code, or portions hereof, for any purpose, without fee, subject
 to the following restrictions:
Index: working_classlib/LICENSE
===================================================================
--- working_classlib/LICENSE	(revision 807222)
+++ working_classlib/LICENSE	(working copy)
@@ -216,14 +216,14 @@
 
 
 
-License Notice for ICU4J version 4.0
-====================================
+License Notice for ICU4J version 4.2.1
+======================================
 
 ICU4J license - ICU4J 1.8.1 and later
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright (c) 1995-2008 International Business Machines Corporation and others 
+Copyright (c) 1995-2009 International Business Machines Corporation and others 
 
 All rights reserved. 
 
@@ -470,7 +470,7 @@
 This distribution may contain software that is based in part on Little cms
 for which the following notice applies:
 
-Copyright (C) 1998-2004 Marti Maria
+Copyright (c) 1998-2007 Marti Maria Saguer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -500,12 +500,67 @@
 Notice for libpng
 =================
 
-This distribution may contain software that is based in part on libpng v1.2.10
-for which the following notice applies:
+This distribution may contain software that is based in part on libpng
+v1.2.38 for which the following notice applies:
 
-Copyright (c) 2004, 2006 Glenn Randers-Pehrson
+libpng versions 1.2.6, August 15, 2004, through 1.2.38, July 16, 2009, are
+Copyright (c) 2004, 2006-2009 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
 
+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
+
+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.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998, 1999, 2000 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
+
+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
+
+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"
+is defined as the following set of individuals:
+
+   Andreas Dilger
+   Dave Martindale
+   Guy Eric Schalnat
+   Paul Schmidt
+   Tim Wegner
+
 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
@@ -514,13 +569,6 @@
 or consequential damages, which may result from the use of the PNG
 Reference Library, even if advised of the possibility of such damage.
 
-   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.
-
 Permission is hereby granted to use, copy, modify, and distribute this
 source code, or portions hereof, for any purpose, without fee, subject
 to the following restrictions:



Mime
View raw message