Removed QPL 6c, choice of venue and changed QPL 3a wordings.

diff --git a/debian/copyright b/debian/copyright
index b85552dd33e3d0819cc246f2b04d48986936281e..42bf9b70a15f43a4567cc50dba9455d514ee2842 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,8 +18,8 @@ INRIA" in the following directories and their sub-directories:
 and "the Compiler" refers to all files marked "Copyright INRIA" in the
 other directories and their sub-directories.
 
-The Compiler is distributed under the terms of the Q Public License
-version 1.0 (included below).
+The Compiler is distributed under the terms of a modified 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
@@ -41,7 +41,7 @@ Public License.
 
 ----------------------------------------------------------------------
 
-                   THE Q PUBLIC LICENSE version 1.0
+       THE MODIFIED Q PUBLIC LICENSE version 1.0 (ocaml version)
 
               Copyright (C) 1999 Troll Tech AS, Norway.
                   Everyone is permitted to copy and
@@ -75,7 +75,7 @@ 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.
+      in the Software except by adding new authors.
 
       b. When modifications to the Software are released under this
       license, a non-exclusive royalty-free right is granted to the
@@ -121,10 +121,6 @@ requirements:
       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
@@ -142,5 +138,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.