Changed copyright file to reflect the new QPL licence clarification.

Added mention of the emacs binding files, which are under the GPL.

diff --git a/debian/copyright b/debian/copyright
index 83c927aee7af3aee410d5a1af7778ec7c5686235..ffe1fd68d91df3e0d5e9db9aab5bf9822bcf41f6 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,21 +13,36 @@ 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
 
 and "the Compiler" refers to all files marked "Copyright INRIA" in the
-other directories and their sub-directories.
+following directories and their sub-directories:
 
-The Compiler is distributed under the terms of the Q Public License
-version 1.0 (included below).
+  asmcomp, boot, bytecomp, debugger, driver, lex, ocamldoc, parsing,
+  tools, toplevel, typing, utils, yacc
+
+and the "emacs bindings" refer to all files marked "Copyright INRIA" in
+the followin directory :
 
-As a special exception to the Q Public License version 1.0, you may ignore
-the QPL 6c clause completely.
+  emacs
+
+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 (found in /usr/share/common-licenses/LGPL-2
 on debian systems).
 
+The emacs bindings are distributed under the terms of the GNU General
+Public License version 2 (found in /usr/share/common-licenses/GPL-2
+on debian systems).
+
+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