From: Sven Luther Date: Mon, 23 Aug 2004 08:41:39 +0000 (+0000) Subject: Modified additional ocaml binary packages with diverging copyright. X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~770 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f26d210d05f6446941b2f394edd58d1203283244;p=ocaml.git Modified additional ocaml binary packages with diverging copyright. --- diff --git a/debian/ocaml-base-nox.copyright b/debian/ocaml-base-nox.copyright index 4175e772..46b863c8 100644 --- a/debian/ocaml-base-nox.copyright +++ b/debian/ocaml-base-nox.copyright @@ -10,7 +10,7 @@ Copyright: In the following, "the Library" refers to all files marked "Copyright INRIA" in the following directories and their sub-directories: - asmrun, byterun, config, maccaml, otherlibs, stdlib, win32caml + asmrun, byterun, config, maccaml, otherlibs, stdlib, win32caml The Library is distributed under the terms of the GNU Library General Public License version 2 (found in /usr/share/common-licenses/LGPL-2 diff --git a/debian/ocaml-base.copyright b/debian/ocaml-base.copyright index 4175e772..24e0704d 100644 --- a/debian/ocaml-base.copyright +++ b/debian/ocaml-base.copyright @@ -10,7 +10,7 @@ Copyright: In the following, "the Library" refers to all files marked "Copyright INRIA" in the following directories and their sub-directories: - asmrun, byterun, config, maccaml, otherlibs, stdlib, win32caml + asmrun, byterun, camlp4, config, otherlibs, stdlib, win32caml The Library is distributed under the terms of the GNU Library General Public License version 2 (found in /usr/share/common-licenses/LGPL-2 diff --git a/debian/ocaml-compiler-libs.copyright b/debian/ocaml-compiler-libs.copyright index 1200e1d5..00d39f7a 100644 --- a/debian/ocaml-compiler-libs.copyright +++ b/debian/ocaml-compiler-libs.copyright @@ -14,34 +14,20 @@ NOT LGPL. Copyright: -In the following, "the Library" refers to all files marked "Copyright +In the following, "the Compiler" refers to all files marked "Copyright INRIA" in the following directories and their sub-directories: - asmrun, byterun, config, maccaml, otherlibs, stdlib, win32caml - -and "the Compiler" refers to all files marked "Copyright INRIA" in the -other 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 (included below). - -The Library is distributed under the terms of the GNU Library General -Public License version 2 (found in /usr/share/common-licenses/LGPL-2 -on debian systems). - -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 3 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. +version 1.0 with a change to choice of law (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. ---------------------------------------------------------------------- @@ -146,5 +132,4 @@ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Choice of Law -This license is governed by the Laws of France. Disputes shall be -settled by the Court of Versailles. +This license is governed by the Laws of France.