20332567 Ocaml needs a license file update
authorStefan Teleman <stefan.teleman@oracle.com>
Mon, 12 Jan 2015 07:30:32 -0800
changeset 3622 0ad0ca4eca8e
parent 3621 3e00113c3743
child 3625 43b658b2e7cf
20332567 Ocaml needs a license file update
components/ocaml/ocaml.license
components/ocaml/ocaml.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ocaml/ocaml.license	Mon Jan 12 07:30:32 2015 -0800
@@ -0,0 +1,842 @@
+In the following, "the Library" refers to all files marked "Copyright
+INRIA" in the following directories and their sub-directories:
+
+  asmrun, byterun, camlp4, config, otherlibs, stdlib, win32caml
+
+and "the Compiler" refers to all files marked "Copyright INRIA" in the
+following directories and their sub-directories:
+
+  asmcomp, boot, bytecomp, debugger, driver, lex, ocamldoc, parsing,
+  tools, toplevel, typing, utils, yacc
+
+The Compiler is distributed under the terms of the Q Public License
+version 1.0 with a change to choice of law (included below).
+
+The Library is distributed under the terms of the GNU Library General
+Public License version 2 (included below).
+
+As a special exception to the Q Public Licence, you may develop
+application programs, reusable components and other software items
+that link with the original or modified versions of the Compiler
+and are not made available to the general public, without any of the
+additional requirements listed in clause 6c of the Q Public licence.
+
+As a special exception to the GNU Library General Public License, you
+may link, statically or dynamically, a "work that uses the Library"
+with a publicly distributed version of the Library to produce an
+executable file containing portions of the Library, and distribute
+that executable file under terms of your choice, without any of the
+additional requirements listed in clause 6 of the GNU Library General
+Public License.  By "a publicly distributed version of the Library",
+we mean either the unmodified Library as distributed by INRIA, or a
+modified version of the Library that is distributed under the
+conditions defined in clause 2 of the GNU Library General Public
+License.  This exception does not however invalidate any other reasons
+why the executable file might be covered by the GNU Library General
+Public License.
+
+
+THE Q PUBLIC LICENSE
+version 1.0
+
+Copyright (C) 1999-2005 Trolltech AS, Norway.
+Everyone is permitted to copy and distribute this license document.
+
+The intent of this license is to establish freedom to share and change the
+software regulated by this license under the open source model.
+
+This license applies to any software containing a notice placed by the
+copyright holder saying that it may be distributed under the terms of
+the Q Public License version 1.0. Such software is herein referred to as
+the Software. This license covers modification and distribution of the
+Software, use of third-party application programs based on the Software,
+and development of free software which uses the Software.
+
+
+ Granted Rights
+
+1. You are granted the non-exclusive rights set forth in this license
+   provided you agree to and comply with any and all conditions in this
+   license. Whole or partial distribution of the Software, or software
+   items that link with the Software, in any form signifies acceptance of
+   this license.
+
+2. You may copy and distribute the Software in unmodified form provided
+   that the entire package, including - but not restricted to - copyright,
+   trademark notices and disclaimers, as released by the initial developer
+   of the Software, is distributed.
+
+3. You may make modifications to the Software and distribute your
+   modifications, in a form that is separate from the Software, such as
+   patches. The following restrictions apply to modifications:
+
+ a. Modifications must not alter or remove any copyright notices in
+the Software.
+
+ b. When modifications to the Software are released under this
+license, a non-exclusive royalty-free right is granted to the
+initial developer of the Software to distribute your modification
+in future versions of the Software provided such versions remain
+available under these terms in addition to any other license(s) of
+the initial developer.
+
+4. You may distribute machine-executable forms of the Software or
+   machine-executable forms of modified versions of the Software, provided
+   that you meet these restrictions:
+
+ a. You must include this license document in the distribution.
+
+ b. You must ensure that all recipients of the machine-executable forms
+are also able to receive the complete machine-readable source code
+to the distributed Software, including all modifications, without
+any charge beyond the costs of data transfer, and place prominent
+notices in the distribution explaining this.
+
+ c. You must ensure that all modifications included in the
+machine-executable forms are available under the terms of this
+license.
+
+5. You may use the original or modified versions of the Software to
+   compile, link and run application programs legally developed by you
+   or by others.
+
+6. You may develop application programs, reusable components and other
+   software items that link with the original or modified versions of the
+   Software. These items, when distributed, are subject to the following
+   requirements:
+
+ a. You must ensure that all recipients of machine-executable forms of
+these items are also able to receive and use the complete
+machine-readable source code to the items without any charge
+beyond the costs of data transfer.
+
+ b. You must explicitly license all recipients of your items to use
+and re-distribute original and modified versions of the items in
+both machine-executable and source code forms. The recipients must
+be able to do so without any charges whatsoever, and they must be
+able to re-distribute to anyone they choose.
+
+ c. If the items are not available to the general public, and the
+initial developer of the Software requests a copy of the items,
+then you must supply one.
+
+
+Limitations of Liability
+
+In no event shall the initial developers or copyright holders be liable
+for any damages whatsoever, including - but not restricted to - lost
+revenue or profits or other direct, indirect, special, incidental or
+consequential damages, even if they have been advised of the possibility
+of such damages, except to the extent invariable law, if any, provides
+otherwise.
+
+
+  No Warranty
+
+The Software and this license document are provided AS IS with NO WARRANTY
+OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE.
+
+ Choice of Law
+
+This license is governed by the Laws of Norway. Disputes shall be settled
+by Oslo City Court.
+
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+^L
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+
+     Appendix: How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+    MA 02111-1307, USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
+Copyright in source:
+
+                Objective Caml LablTk library
+
+         Francois Rouaix, Francois Pessaux and Jun Furuse
+               projet Cristal, INRIA Rocquencourt
+            Jacques Garrigue, Kyoto University RIMS
+
+   Copyright 1999 Institut National de Recherche en Informatique et
+   en Automatique and Kyoto University.  All rights reserved.
+   This file is distributed under the terms of the GNU Library
+   General Public License, with the special exception on linking
+   described in file ../../../LICENSE.
+
+                          Objective Caml
+
+           Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+ Copyright 1998 Institut National de Recherche en Informatique et
+ en Automatique.  All rights reserved.  This file is distributed
+ under the terms of the GNU Library General Public License, with
+ the special exception on linking described in file ../LICENSE.
+
+ Copyright 1996 Institut National de Recherche en Informatique et
+ Copyright 2004 Institut National de Recherche en Informatique et
+           Jacob Navia, after Xavier Leroy
+
+ Copyright 2001 Institut National de Recherche en Informatique et
+             Jun Furuse, projet Cristal, INRIA Rocquencourt
+
+ Copyright 2001 Institut National de Recherche en Informatique et
+ en Automatique.  All rights reserved.  This file is distributed
+ under the terms of the GNU Library General Public License, with
+ the special exception on linking described in file ../../LICENSE.
+
+                          Objective Caml
+
+           Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+ Copyright 2004 Institut National de Recherche en Informatique et
+ en Automatique.  All rights reserved.  This file is distributed
+ under the terms of the GNU Library General Public License, with
+ the special exception on linking described in file ../LICENSE.
+
+
+                           Objective Caml
+
+            Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 2003 Institut National de Recherche en Informatique et
+  Copyright 1996 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../../LICENSE.
+
+
+
+                            Objective Caml
+
+       Nicolas Pouillard, projet Gallium, INRIA Rocquencourt
+
+   Copyright 2007 Institut National de Recherche en Informatique et
+   en Automatique.  All rights reserved.  This file is distributed
+   under the terms of the Q Public License version 1.0.
+
+                           Objective Caml
+
+  Developed by Jacob Navia
+  Copyright 2001 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../../LICENSE.
+
+
+                           Objective Caml
+
+            Xavier Leroy, projet Gallium, INRIA Rocquencourt
+
+  Copyright 2006 Institut National de Recherche en Informatique et
+          Damien Doligez, Projet Moscova, INRIA Rocquencourt
+
+  Copyright 2003 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../LICENSE.
+
+
+
+                           Objective Caml
+
+            Jacob Navia, after Xavier Leroy
+
+  Copyright 2001 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../LICENSE.
+
+  Contributed by Tracy Camp, PolyServe Inc., <[email protected]>
+  Further improvements by Reed Wilson
+
+  Copyright 2002 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../../LICENSE.
+  under the terms of the GNU Library General Public License.
+
+
+                           Objective Caml
+
+            Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 1996 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the Q Public License version 1.0.
+
+  Copyright 1999 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../../LICENSE.
+
+
+                           Objective Caml
+
+            Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 1996 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../LICENSE.
+
+          Damien Doligez, projet Moscova, INRIA Rocquencourt
+
+  Copyright 2002 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../../LICENSE.
+
+
+                           Objective Caml
+
+          Damien Doligez, projet Moscova, INRIA Rocquencourt
+
+  Copyright 2003 Institut National de Recherche en Informatique et
+         Xavier Leroy and Damien Doligez, INRIA Rocquencourt
+
+  Copyright 1996 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../LICENSE.
+
+ definitions for compatibility with old identifiers
+            Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 2001 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../../LICENSE.
+
+
+                           Objective Caml
+
+            Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 1999 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../LICENSE.
+
+
+                           Objective Caml
+
+  Contributed by Sylvain Le Gall for Lexifi
+
+  Copyright 2008 Institut National de Recherche en Informatique et
+  Xavier Leroy and Pascal Cuoq, projet Cristal, INRIA Rocquencourt
+
+  Copyright 1996 Institut National de Recherche en Informatique et
+            Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 1998 Institut National de Recherche en Informatique et
+            Francois Rouaix, projet Cristal, INRIA Rocquencourt
+
+  Copyright 1996 Institut National de Recherche en Informatique et
+  Copyright 1997 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../../LICENSE.
+
+
+                          Objective Caml
+
+            Damien Doligez, projet Para, INRIA Rocquencourt
+
+ Copyright 1997 Institut National de Recherche en Informatique et
+ en Automatique.  All rights reserved.  This file is distributed
+ under the terms of the GNU Library General Public License, with
+ the special exception on linking described in file ../LICENSE.
+
+           Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+ Copyright 2000 Institut National de Recherche en Informatique et
+ en Automatique.  All rights reserved.  This file is distributed
+ under the terms of the GNU Library General Public License, with
+ the special exception on linking described in file ../../LICENSE.
+
+
+                          Objective Caml
+
+           Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+ Copyright 1999 Institut National de Recherche en Informatique et
+                File contributed by Lionel Fourquaux
+
+ Copyright 2001 Institut National de Recherche en Informatique et
+ Copyright 2003 Institut National de Recherche en Informatique et
+ en Automatique.  All rights reserved.  This file is distributed
+ under the terms of the GNU Library General Public License, with
+ the special exception on linking described in file ../../LICENSE.
+
+
+                 MLTk, Tcl/Tk interface of Objective Caml
+
+    Francois Rouaix, Francois Pessaux, Jun Furuse and Pierre Weis
+               projet Cristal, INRIA Rocquencourt
+            Jacques Garrigue, Kyoto University RIMS
+
+  Copyright 2002 Institut National de Recherche en Informatique et
+  en Automatique and Kyoto University.  All rights reserved.
+  This file is distributed under the terms of the GNU Library
+  General Public License, with the special exception on linking
+  described in file LICENSE found in the Objective Caml source tree.
+
+                           Objective Caml
+
+  Contributed by Tracy Camp, PolyServe Inc., <[email protected]>
+
+  Copyright 2002 Institut National de Recherche en Informatique et
+            Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 1996 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+ the special exception on linking described in file ../../LICENSE.
+
+ Alternative to tkwait variable
+ tkAppInit.c --
+
+      Provides a default version of the Tcl_AppInit procedure for
+      use in wish and similar Tk-based applications.
+
+ Copyright (c) 1993 The Regents of the University of California.
+ Copyright (c) 1994 Sun Microsystems, Inc.
+
+ See the file "license.terms" for information on usage and redistribution
+ of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+
+                           Objective Caml
+
+            Xavier Leroy, projet Gallium, INRIA Rocquencourt
+
+  Copyright 2007 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../LICENSE.
+
+         Manuel Serrano and Xavier Leroy, INRIA Rocquencourt
+
+  Copyright 2000 Institut National de Recherche en Informatique et
+   Pascal Cuoq and Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 1996 Institut National de Recherche en Informatique et
+            Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 1997 Institut National de Recherche en Informatique et
+  Contributed by Sylvain Le Gall for Lexifi
+
+  Copyright 2008 Institut National de Recherche en Informatique et
+  Developed by Jacob Navia, based on code by J-M Geffroy and X Leroy
+  Copyright 2001 Institut National de Recherche en Informatique et
+  Copyright 2006 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../../LICENSE.
+
+
+                           Objective Caml
+
+           Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 2001 Institut National de Recherche en Informatique et
+          Damien Doligez, projet Moscova, INRIA Rocquencourt
+
+  Copyright 2000 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../LICENSE.
+
+                           Objective Caml
+
+         Xavier Leroy and Damien Doligez, INRIA Rocquencourt
+
+  Copyright 2007 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../LICENSE.
+
+  Contributed by Sylvain Le Gall for Lexifi
+
+  Copyright 2008 Institut National de Recherche en Informatique et
+            Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 2002 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../../LICENSE.
+
+                           Objective Caml
+
+            Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 2002 Institut National de Recherche en Informatique et
+  Copyright 1996 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../LICENSE.
+
+                             Objective Caml
+
+         Xavier Leroy and Damien Doligez, INRIA Rocquencourt
+
+  Copyright 1995 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../../LICENSE.
+
+            Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 1998 Institut National de Recherche en Informatique et
+            Xavier Leroy, projet Cristal, INRIA Rocquencourt
+
+  Copyright 2001 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../LICENSE.
+
+
+                         Objective Caml
+
+           Xavier Leroy and Pascal Cuoq, INRIA Rocquencourt
+
+  Copyright 1995 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../../LICENSE.
+
+                           Objective Caml
+
+  Developed by Jacob Navia.
+  Copyright 2001 Institut National de Recherche en Informatique et
+         Manuel Serrano and Xavier Leroy, INRIA Rocquencourt
+
+  Copyright 2000 Institut National de Recherche en Informatique et
+             Damien Doligez, projet Para, INRIA Rocquencourt
+
+  Copyright 1996 Institut National de Recherche en Informatique et
+  en Automatique.  All rights reserved.  This file is distributed
+  under the terms of the GNU Library General Public License, with
+  the special exception on linking described in file ../LICENSE.
--- a/components/ocaml/ocaml.p5m	Fri Jan 09 19:21:01 2015 -0800
+++ b/components/ocaml/ocaml.p5m	Mon Jan 12 07:30:32 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=(.+)/man/man3/(.+).3o$ -> set action.hash %<\1>/man/man3/%<\2>.3o >
 <transform file -> edit path man/man3 man/man3o >
@@ -1380,10 +1380,11 @@
 file path=usr/share/man/man3/Weak.Make.3o
 file path=usr/share/man/man3/Weak.S.3o
 #
-license LICENSE license="QPLv1, GPLv2"
+license ocaml.license license="QPLv1, GPLv2"
 
 # ocaml was previously in the 'desktop' consolidation. This optional
 # dependency is here to facilitate the safe transfer of the package
 # to the 'userland' consolidation.
 depend type=optional \
     fmri=consolidation/desktop/[email protected]
+