Merge pull request #641 from JeromeMartinez/License

License change
MediaArea · Mar 19, 2018 · f194094 · f194094
2 parents d718f25 + 334769e
commit f194094
Show file tree

Hide file tree

Showing 389 changed files with 306 additions and 20,612 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2015-2018, MediaArea.net SARL
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/License.GPLv3.html b/License.GPLv3.html
diff --git a/License.MPLv2.html b/License.MPLv2.html
diff --git a/License.html b/License.html
@@ -1,50 +1,77 @@
 <!DOCTYPE html>
 <html lang="en-US">
-    <head>
-        <title>MediaConch - License</title>
-        <meta charset="UTF-8" />
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="stylesheet" href="qrc:/bootstrap.css">
-        <link rel="stylesheet" type="text/css" href="qrc:/main.css" media="screen"/>
-    </head>
-    <body id="body">
-
-<h1>About</h1>
-
-<p>Copyright ©: 2015-2016, MediaArea.net SARL. All Rights Reserved. </p>
-
-<p>Version 17.12 </p>
-
-<p>MediaConch is licensed under a <a href="http://www.gnu.org/licenses/gpl-3.0.html">GPLv3+</a>/<a href="https://www.mozilla.org/en-US/MPL/2.0/">MPLv2+</a> License. </p>
-
-<p>This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. </p>
-
-<p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. </p>
-
-<p>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. </p>
-
-<h2>Third party libraries</h2>
+<head>
+    <title>MediaConch - License</title>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="qrc:/bootstrap.css">
+    <link rel="stylesheet" type="text/css" href="qrc:/main.css" media="screen"/>
+</head>
+<body>
+<div>
+    <h3 style="text-align: center">MediaConch License</h3>
+    <p>
+        Copyright (c) 2015-2018 <a href="mailto:[email protected]">MediaArea.net SARL</a>. All rights reserved.
+    </p>
+    <p>
+        Redistribution and use in source and binary forms, with or without modification,
+        are permitted provided that the following conditions are met:
+    </p>
+    <ul>
+        <li>Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.</li>
+        <li>Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation and/or
+        other materials provided with the distribution.</li>
+    </ul>
+    <p>
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &ldquo;AS IS&rdquo;
+        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+        OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+        COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+        EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+        GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+        AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+        NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+        OF THE POSSIBILITY OF SUCH DAMAGE.
+    </p>
+</div>
+
+<hr/>
+<div>
+<p>Alternate open source licenses:<br/>
+You can relicense (including source headers change) MediaConch
+under Apache License 2.0 or later,
+and/or GNU Lesser General Public License 2.1 or later,
+and/or GNU General Public License 2.0 or later,
+and/or Mozilla Public License 2.0 or later.</p>
+</div>
+
+<hr/>
+<div>
+
+<h3>Third party libraries</h3>
 
 <p>The software relies on third party libraries. Such libraries have their own license: </p>
 
 <ul>
-    <li>Media analysis library: MediaInfoLib, (c) MediaArea.net SARL, initialy BSD-2-Clause license, relicensed to GPLv3 or later / MPLv2 or later</li>
-    <li>Base classes library: ZenLib, (c) MediaArea.net SARL, initialy zlib license, relicensed to GPLv3 or later / MPLv2 or later</li>
-    <li>C++ standard library: <a href="http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt01ch01s02.html">libstdc++</a> (GPLv3+ with linking exception), <a href="http://llvm.org/docs/DeveloperPolicy.html#license">libc++</a> (MIT license, could be relicensed to GPLv3 or later / MPLv2 or later), <a href="http://msdn.microsoft.com/en-us/library/vstudio/ms235299.aspx">Visual C++ library</a> (Microsoft proprietary license) or any other C++ standard library</li>
-    <li>GUI (optional): <a href="https://www.qt.io/qt-licensing-terms/">Qt</a>, LGPLv3+ license, compatible with GPLv3 or later / MPLv2 or later. Uses several third party libraries, <a href="Qt_Licenses/index.html">with their own licenses</a>, all compatible with GPLv3 or later / MPLv2 or later</li>
-    <li>WebUI engine (optional) : <a href="https://symfony.com/license">Symfony</a>, MIT license, could be relicensed to GPLv3 or later / MPLv2 or later</li>
-    <li>WebUI design (optional) : <a href="http://getbootstrap.com/getting-started/">Bootstrap</a>, MIT license, could be relicensed to GPLv3 or later / MPLv2 or later</li>
-    <li>XML parser (optional): <a href="http://www.grinninglizard.com/tinyxml2docs/index.html">TinyXML-2</a>, zlib license, could be relicensed to GPLv3 or later / MPLv2 or later</li>
-    <li>gzip decompression routine (optional): <a href="http://www.gzip.org/zlib/zlib_license.html">zlib</a>, zlib license, could be relicensed to GPLv3 or later / MPLv2 or later</li>
-    <li>FTP, FTPS, SFTP, HTTP, HTTPS (optional): <a href="http://curl.haxx.se/docs/copyright.html">libcurl</a>, MIT license, could be relicensed to GPLv3 or later / MPLv2 or later</li>
-    <li>Base64 (optional): base64 by Bob Withers, public domain, could be relicensed to GPLv3 or later / MPLv2 or later</li>
-    <li>AES (optional): aes by Brian Gladman, BSD-2-Clause license, compatible with GPLv3 or later / MPLv2 or later</li>
-    <li>MD5 (optional): md5 by Colin Plumb, public domain, could be relicensed to GPLv3 or later / MPLv2 or later</li>
-    <li>SHA-1 (optional): sha1 by Brian Gladman, BSD-2-Clause license, compatible with GPLv3 or later / MPLv2 or later</li>
-    <li>SHA-2 (optional): sha2 by Brian Gladman, BSD-2-Clause license, compatible with GPLv3 or later / MPLv2 or later</li>
-    <li>HMAC (optional): hmac by Brian Gladman, BSD-2-Clause license, compatible with GPLv3 or later / MPLv2 or later</li>
-    <li>SQLite (optional): the author disclaims copyright, compatible with GPLv3 or later / MPLv2 or later</li>
+    <li>Media analysis library: MediaInfoLib, (c) MediaArea.net SARL, BSD-2-Clause license</li>
+    <li>Base classes library: ZenLib, (c) MediaArea.net SARL, initialy zlib license</li>
+    <li>C++ standard library: <a href="http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt01ch01s02.html">libstdc++</a> (GPLv3+ with linking exception), <a href="http://llvm.org/docs/DeveloperPolicy.html#license">libc++</a> (MIT license), <a href="http://msdn.microsoft.com/en-us/library/vstudio/ms235299.aspx">Visual C++ library</a> (Microsoft proprietary license) or any other C++ standard library</li>
+    <li>GUI (optional): <a href="https://www.qt.io/qt-licensing-terms/">Qt</a>, LGPLv3+ license</li>
+    <li>WebUI engine (optional) : <a href="https://symfony.com/license">Symfony</a>, MIT license</li>
+    <li>WebUI design (optional) : <a href="http://getbootstrap.com/getting-started/">Bootstrap</a>, MIT license/li>
+    <li>XML parser (optional): <a href="http://www.grinninglizard.com/tinyxml2docs/index.html">TinyXML-2</a>, zlib license</li>
+    <li>gzip decompression routine (optional): <a href="http://www.gzip.org/zlib/zlib_license.html">zlib</a>, zlib license</li>
+    <li>FTP, FTPS, SFTP, HTTP, HTTPS (optional): <a href="http://curl.haxx.se/docs/copyright.html">libcurl</a>, MIT license</li>
+    <li>Base64 (optional): base64 by Bob Withers, public domain</li>
+    <li>AES (optional): aes by Brian Gladman, BSD-2-Clause license</li>
+    <li>MD5 (optional): md5 by Colin Plumb, public domain</li>
+    <li>SHA-1 (optional): sha1 by Brian Gladman, BSD-2-Clause license</li>
+    <li>SHA-2 (optional): sha2 by Brian Gladman, BSD-2-Clause license</li>
+    <li>HMAC (optional): hmac by Brian Gladman, BSD-2-Clause license</li>
+    <li>SQLite (optional): the author disclaims copyright</li>
 </ul>
 
 <h2>The Team</h2>
@@ -65,9 +92,12 @@ <h2>The Team</h2>
     <li>Tessa Fallon (Archivist): community outreach and standards organization </li>
 </ul>
 
+</div>
+
+<hr/>
+<div>
 <p>This project has received funding from <a href="http://preforma-project.eu">PREFORMA</a>, co-funded by the <a href="http://europa.eu/">European Commission</a> under its <a href="http://ec.europa.eu/research/fp7/index_en.cfm">FP7-ICT</a> Programme </p>
 
-      <script src="qrc:/jquery.js"></script>
-      <script src="qrc:/bootstrap.js"></script>
-    </body>
+</div>
+</body>
 </html>
diff --git a/Project/AppImage/Recipe.sh b/Project/AppImage/Recipe.sh
@@ -2,7 +2,7 @@
 
 #  Copyright (c) MediaArea.net SARL. All Rights Reserved.
 #
-#  Use of this source code is governed by a GPL v3+ and MPL v2+ license that can
+#  Use of this source code is governed by a BSD-style license that can
 #  be found in the License.html file in the root of the source tree.
 #
 

diff --git a/Project/GNU/GUI/mediaconch-gui.metainfo.xml b/Project/GNU/GUI/mediaconch-gui.metainfo.xml
@@ -3,7 +3,7 @@
 <component type="desktop">
   <id type="desktop">mediaconch-gui.desktop</id>
   <metadata_license>CC-BY-3.0</metadata_license>
-  <project_license>MPL-2.0 OR GPL-3.0+</project_license>
+  <project_license>BSD-2-Clause</project_license>
   <name>MediaConch</name>
   <summary>Implementation checker, policy checker, reporter, and fixer</summary>
   <description>

diff --git a/Project/GNU/PKGBUILD b/Project/GNU/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=17.12
 pkgrel=1
 pkgdesc="Implementation checker and policy checker for video and audio files"
 url="http://MediaArea.net/MediaConch"
-license=('custom:MPL2' 'GPL3')
+license=('BSD-2-Clause')
 source=(${pkgname}_${pkgver}.orig.tar.xz)
 md5sums=('00000000000000000000000000000000')
 arch=('i686' 'x86_64')
@@ -56,8 +56,6 @@ package_mediaconch() {
 
     cd "${srcdir}"/MediaConch
     install -D -m 0644 License.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.html
-    install -D -m 0644 License.MPLv2.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.MPLv2.html
-    install -D -m 0644 License.GPLv3.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.GPLv3.html
 
     install -D -m 0644 History_CLI.txt "${pkgdir}"/usr/share/docs/${pkgname}/History.txt
     install -D -m 0644 Release/ReadMe_CLI_Linux.txt "${pkgdir}"/usr/share/docs/${pkgname}/ReadMe.txt
@@ -76,8 +74,6 @@ package_mediaconch-server() {
 
     cd "${srcdir}"/MediaConch
     install -D -m 0644 License.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.html
-    install -D -m 0644 License.MPLv2.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.MPLv2.html
-    install -D -m 0644 License.GPLv3.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.GPLv3.html
 
     install -D -m 0644 Documentation/Daemon.md "${pkgdir}"/usr/share/docs/${pkgname}/Daemon.md
     install -D -m 0644 Documentation/Config.md "${pkgdir}"/usr/share/docs/${pkgname}/Config.md
@@ -102,8 +98,6 @@ package_mediaconch-gui() {
     install -D -m 0644 Project/GNU/GUI/mediaconch-gui.metainfo.xml "${pkgdir}"/usr/share/metainfo/mediaconch-gui.metainfo.xml
 
     install -D -m 0644 License.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.html
-    install -D -m 0644 License.MPLv2.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.MPLv2.html
-    install -D -m 0644 License.GPLv3.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.GPLv3.html
 
     install -D -m 0644 History_GUI.txt "${pkgdir}"/usr/share/docs/${pkgname}/History.txt
     install -D -m 0644 Release/ReadMe_GUI_Linux.txt "${pkgdir}"/usr/share/docs/${pkgname}/ReadMe.txt

diff --git a/Project/GNU/mediaconch.spec b/Project/GNU/mediaconch.spec
@@ -29,7 +29,7 @@ Release:        1
 Summary:        Implementation checker and policy checker for video and audio files (CLI)
 
 Group:          Applications/Multimedia
-License:        MPL-2.0+/GPL-3.0+
+License:        BSD-2-Clause
 URL:            http://MediaArea.net/MediaConch
 Packager:       MediaArea.net SARL <[email protected]>
 Source0:        %{name}_%{version}.tar.gz
@@ -354,9 +354,9 @@ fi
 %defattr(-,root,root,-)
 %doc Release/ReadMe_CLI_Linux.txt History_CLI.txt
 %if 0%{?fedora_version} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
-%license License.html License.GPLv3.html License.MPLv2.html
+%license License.html
 %else
-%doc License.html License.GPLv3.html License.MPLv2.html
+%doc License.html
 %endif
 %{_bindir}/mediaconch
 
@@ -365,9 +365,9 @@ fi
 %defattr(-,root,root,-)
 %doc Documentation/Daemon.md Documentation/Config.md Documentation/REST.md
 %if 0%{?fedora_version} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
-%license License.html License.GPLv3.html License.MPLv2.html
+%license License.html
 %else
-%doc License.html License.GPLv3.html License.MPLv2.html
+%doc License.html
 %endif
 %{_bindir}/mediaconchd
 %if 0%{?fedora_version}
@@ -381,9 +381,9 @@ fi
 %defattr(-,root,root,-)
 %doc Release/ReadMe_GUI_Linux.txt History_GUI.txt
 %if 0%{?fedora_version} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
-%license License.html License.GPLv3.html License.MPLv2.html
+%license License.html
 %else
-%doc License.html License.GPLv3.html License.MPLv2.html
+%doc License.html
 %endif
 %{_bindir}/mediaconch-gui
 %{_datadir}/applications/*.desktop

diff --git a/Project/OBS/deb9.debian/mediaconch.pod b/Project/OBS/deb9.debian/mediaconch.pod
@@ -105,11 +105,10 @@ Apply the display transformation (XSL)
 
 This manual page was written by Chow Loong Jin <[email protected]> for the
 Debian system (but may be used by others). Permissions is granted to copy,
-distribute, and/or modify this document under the terms of the GNU General
-Public License, Version 3 or any later version published by the Free Software
-Foundation, or the Mozilla Public License 2.0.
+distribute, and/or modify this document under the terms of the BSD-2-Clause
+License.
 
-On Debian systems, the full text of the GNU General Public License, Version 3
-can be found in /usr/share/common-licenses/GPL-3.
+On Debian systems, the full text of the BSD-2-Clause License
+can be found in /usr/share/common-licenses/BSD.
 
 =cut