X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=LICENSE.txt;h=8051cea4f7b3af2a74d9efac7c22ac466b33256d;hb=d9814c06bfd4ecdb1192a0002e79e08c37a1e0b8;hp=755ace355e83014387ca88dc4375907029c1baab;hpb=e79917c3db630abe65b8c1eb47eea7595fc0c16e;p=mirror_novnc.git

diff --git a/LICENSE.txt b/LICENSE.txt
index 755ace3..8051cea 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,33 +1,67 @@
 noVNC is Copyright (C) 2011 Joel Martin <github@martintribe.org>
 
-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 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):
+
+    core/**/*.js
+    app/*.js
+    test/playback.js
 
-noVNC is licensed under the LGPL (GNU Lesser General Public License)
-version 3 with the following exceptions (all LGPL-3 compatible):
+The HTML, CSS, font and images files that included with the noVNC
+source distibution (or repository) are not considered part of the
+noVNC core library and are licensed under more permissive licenses.
+The intent is to allow easy integration of noVNC into existing web
+sites and web applications.
 
-    include/input.js           : LGPL-2 or any later version
-   
-    include/base64.js          : Dual GPL-2 or LGPL-2.1
-   
-    include/des.js             : Various BSD style licenses
+The HTML, CSS, font and image files are licensed as follows:
 
-    include/web-socket-js/     : New BSD license. Source code at
-                                 http://github.com/gimite/web-socket-js
+    *.html                     : 2-Clause BSD license
 
-    include/Orbitron*          : SIL Open Font License 1.1
+    app/styles/*.css           : 2-Clause BSD license
+
+    app/styles/Orbitron*       : SIL Open Font License 1.1
                                  (Copyright 2009 Matt McInerney)
 
-    images/                    : Creative Commons Attribution-ShareAlike
+    app/images/                : Creative Commons Attribution-ShareAlike
                                  http://creativecommons.org/licenses/by-sa/3.0/
 
-The license texts are included at:
-    docs/LICENSE.LGPL-3 and
-    docs/LICENSE.GPL-3
+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/novnc/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 MPL 2.0 compatible):
+
+    core/base64.js          : MPL 2.0
+
+    core/des.js             : Various BSD style licenses
+
+    vendor/pako/            : MIT
+
+    vendor/browser-es-module-loader/src/ : MIT
+
+    vendor/browser-es-module-loader/dist/ : Various BSD style licenses
+
+    vendor/promise.js       : MIT
+
+Any other files not mentioned above are typically marked with
+a copyright/license header at the top of the file. The default noVNC
+license is MPL-2.0.
+
+The following license texts are included:
+
+    docs/LICENSE.MPL-2.0
     docs/LICENSE.OFL-1.1
+    docs/LICENSE.BSD-3-Clause (New BSD)
+    docs/LICENSE.BSD-2-Clause (Simplified BSD / FreeBSD)
+    vendor/pako/LICENSE (MIT)
 
 Or alternatively the license texts may be found here:
-    http://www.gnu.org/licenses/lgpl.html and
-    http://www.gnu.org/licenses/gpl.html
+
+    http://www.mozilla.org/MPL/2.0/
     http://scripts.sil.org/OFL
+    http://en.wikipedia.org/wiki/BSD_licenses
+    https://opensource.org/licenses/MIT