Change noVNC license to from LGPLv3 to MPL 2.0

[mirror_novnc.git] / LICENSE.txt

diff --git a/LICENSE.txt b/LICENSE.txt
index 77056152c8fe6ad3a1163a3b3988b5fcfe21fb2c..c5aa50508299bb319f49f83b42608f955ee59014 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@
 noVNC is Copyright (C) 2011 Joel Martin <github@martintribe.org>
 
-The noVNC core library is licensed under the LGPLv3 (GNU Lesser
-General Public License). The noVNC core library is composed of the
+The noVNC core library files are licensed under the MPL 2.0 (Mozilla
+Public License 2.0). The noVNC core library is composed of the
 Javascript code necessary for full noVNC operation. This includes (but
 is not limited to):
 
@@ -36,21 +36,15 @@ The HTML, CSS, font and image files are licensed as follows:
     images/                    : Creative Commons Attribution-ShareAlike
                                  http://creativecommons.org/licenses/by-sa/3.0/
 
-In addition the following file, which is part of the noVNC core
-library, may be licensed under either the LGPL-2, LGPL-3 or MPL 2.0
-when it used separately from the noVNC core library.
-
-    include/input.js           : LGPL-2 or any later version
-   
 Some portions of noVNC are copyright to their individual authors.
 Please refer to the individual source files and/or to the noVNC commit
 history: https://github.com/kanaka/noVNC/commits/master
 
 The are several files and projects that have been incorporated into
 the noVNC core library. Here is a list of those files and the original
-licenses (all LGPL-3 compatible):
+licenses (all MPL 2.0 compatible):
 
-    include/base64.js          : MPL 1.1, GPL-2 or LGPL-2.1
+    include/base64.js          : MPL 2.0
    
     include/des.js             : Various BSD style licenses
 
@@ -62,21 +56,26 @@ licenses (all LGPL-3 compatible):
     include/chrome-app/tcp-stream.js
                                : Apache 2.0 license
 
+    utils/websockify
+    utils/websocket.py         : LGPL 3
+
 The following license texts are included:
 
+    docs/LICENSE.MPL-2.0
     docs/LICENSE.LGPL-3 and
     docs/LICENSE.GPL-3
     docs/LICENSE.OFL-1.1
     docs/LICENSE.BSD-3-Clause (New BSD)
     docs/LICENSE.BSD-2-Clause (Simplified BSD / FreeBSD)
     docs/LICENSE.zlib
-    docs/LICENSE.MPL-2.0
     docs/LICENSE.Apache-2.0
 
 Or alternatively the license texts may be found here:
 
+    http://www.mozilla.org/MPL/2.0/
     http://www.gnu.org/licenses/lgpl.html and
     http://www.gnu.org/licenses/gpl.html
     http://scripts.sil.org/OFL
-    http://www.mozilla.org/MPL/1.1/
-    http://www.mozilla.org/MPL/2.0/
+    http://en.wikipedia.org/wiki/BSD_licenses
+    http://www.gzip.org/zlib/zlib_license.html
+    http://www.apache.org/licenses/LICENSE-2.0.html