[Libreoffice-commits] core.git: 19 commits - readlicense_oo/license

Andras Timar (via logerrit) logerrit at kemper.freedesktop.org
Mon Mar 25 21:35:45 UTC 2019


 readlicense_oo/license/license.xml |  620 ++++++++++++++++++++++++++-----------
 1 file changed, 451 insertions(+), 169 deletions(-)

New commits:
commit f7187feef00a75e492380e13a6f7c2e323694748
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 17:50:42 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:42 2019 +0100

    license: fix ordered list
    
    Change-Id: Ibed1e498226e2e1672941a3a51f3b6abdfb471af

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 60244e855fe5..ff18817bac47 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -536,12 +536,8 @@
     <ol>
         <li>Redistributions of source code must retain the above copyright notice, this list of conditions and the
         following disclaimer.</li>
-    </ol>
-    <ol>
         <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>
-    </ol>
-    <ol>
         <li>Neither the name of the Linux Foundation nor the names of its contributors may be used to endorse or
         promote products derived from this software without specific prior written permission.</li>
     </ol>
commit e91873fb718c035231aa25c8059e62edc76918e5
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 17:48:54 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:42 2019 +0100

    license: add libjepg-turbo
    
    Change-Id: Ifc5c9686941671e261fef9a57b04751c6b918ce4

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 7c044f7407f7..60244e855fe5 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -583,61 +583,6 @@
         the copyright holder.</p>
         <p>All trademarks and registered trademarks mentioned herein are the property of their respective owners.</p>
     </div>
-    <div class="LIBJPEG">
-        <h2>IJG JPEG Library</h2>
-        <p>The following software may be included in this product: IJG JPEG Library. Use of any of this software is
-        governed by the terms of the license below:</p>
-        <p>In plain English:</p>
-        <ol>
-            <li>We don't promise that this software works. (But if you find any bugs, please let us know!) </li>
-            <li>You can use this software for whatever you want. You don't have to pay us.</li>
-            <li>You may not pretend that you wrote this software. If you use it in a program, you must acknowledge
-            somewhere in your documentation that you've used the IJG code.</li>
-        </ol>
-        <p>In legalese:</p>
-        <p>The authors make NO WARRANTY or representation, either express or implied, with respect to this software,
-        its quality, accuracy, merchantability, or fitness for a particular purpose.  This software is provided "AS
-        IS", and you, its user, assume the entire risk as to its quality and accuracy.</p>
-        <p>This software is copyright (C) 1991-1998, Thomas G. Lane. All Rights Reserved except as specified below.</p>
-        <p>Permission is hereby granted to use, copy, modify, and distribute this software (or portions thereof) for
-        any purpose, without fee, subject to these conditions: (1) If any part of the source code for this software is
-        distributed, then this README file must be included, with this copyright and no-warranty notice unaltered; and
-        any additions, deletions, or changes to the original files must be clearly indicated in accompanying
-        documentation. (2) If only executable code is distributed, then the accompanying documentation must state that
-        "this software is based in part on the work of the Independent JPEG Group". (3) Permission for use of this
-        software is granted only if the user accepts full responsibility for any undesirable consequences; the authors
-        accept NO LIABILITY for damages of any kind.</p>
-        <p>These conditions apply to any software derived from or based on the IJG code, not just to the unmodified
-        library.  If you use our work, you ought to acknowledge us.</p>
-        <p>Permission is NOT granted for the use of any IJG author's name or company name in advertising or publicity
-        relating to this software or products derived from it.  This software may be referred to only as "the
-        Independent JPEG Group's software".</p>
-        <p>We specifically permit and encourage the use of this software as the basis of commercial products, provided
-        that all warranty or liability claims are assumed by the product vendor.</p>
-        <p>ansi2knr.c is included in this distribution by permission of L. Peter Deutsch, sole proprietor of its
-        copyright holder, Aladdin Enterprises of Menlo Park, CA. ansi2knr.c is NOT covered by the above copyright and
-        conditions, but instead by the usual distribution terms of the Free Software Foundation; principally, that you
-        must include source code if you redistribute it.  (See the file ansi2knr.c for full details.)  However, since
-        ansi2knr.c is not needed as part of any program generated from the IJG code, this does not limit you more than
-        the foregoing paragraphs do.</p>
-        <p>The Unix configuration script "configure" was produced with GNU Autoconf. It is copyright by the Free
-        Software Foundation but is freely distributable. The same holds for its supporting scripts (config.guess,
-        config.sub, ltconfig, ltmain.sh).  Another support script, install-sh, is copyright by M.I.T. but is also
-        freely distributable.</p>
-        <p>It appears that the arithmetic coding option of the JPEG spec is covered by patents owned by IBM, AT&T,
-        and Mitsubishi.  Hence arithmetic coding cannot legally be used without obtaining one or more licenses.  For
-        this reason, support for arithmetic coding has been removed from the free JPEG software. (Since arithmetic
-        coding provides only a marginal gain over the unpatented Huffman mode, it is unlikely that very many
-        implementations will support it.) So far as we are aware, there are no patent restrictions on the remaining
-        code.</p>
-        <p>The IJG distribution formerly included code to read and write GIF files. To avoid entanglement with the
-        Unisys LZW patent, GIF reading support has been removed altogether, and the GIF writer has been simplified to
-        produce "uncompressed GIFs".  This technique does not use the LZW algorithm; the resulting GIF files are
-        larger than usual, but are readable by all standard GIF decoders.</p>
-        <p>We are required to state that</p>
-        <p>The Graphics Interchange Format(c) is the Copyright property of CompuServe Incorporated.  GIF(sm) is a
-        Service Mark property of CompuServe Incorporated."</p>
-    </div>
     <div class="LIBATOMIC_OPS">
         <h2>libatomic_ops</h2>
         <p>The following software may be included in this product: libatomic_ops. Use of any of this software is
@@ -762,6 +707,201 @@
         by the terms of the license below:</p>
         <p><a href="#a__MPL_version_2">Jump to MPL Version 2.0</a></p>
     </div>
+    <div class="LIBJPEG_TURBO">
+        <h2>libjpeg-turbo</h2>
+        <p>The following software may be included in this product: libjpeg-turbo. libjpeg-turbo is covered by three
+        compatible BSD-style open source licenses:</p>
+        <ul>
+            <li>
+                <p>The IJG (Independent JPEG Group) License, which is listed <a href="#a__IJG_License">below</a></p>
+                <p>This license applies to the libjpeg API library and associated programs (any code inherited from
+                libjpeg, and any modifications to that code.)</p>
+            </li>
+            <li>
+                <p>The Modified (3-clause) BSD License, which is listed below</p>
+                <p>This license covers the TurboJPEG API library and associated programs, as well as the build
+                system.</p>
+            </li>
+            <li>
+                <p>The <a href="#a__Zlib_license">zlib License</a></p>
+                <p>This license is a subset of the other two, and it covers the libjpeg-turbo SIMD extensions.</p>
+            </li>
+        </ul>
+        <h3>Complying with the libjpeg-turbo Licenses</h3>
+        <p>This section provides a roll-up of the libjpeg-turbo licensing terms, to the best of our understanding.</p>
+        <ol>
+            <li>
+                <p>If you are distributing a modified version of the libjpeg-turbo source, then:</p>
+                <ol type="i">
+                    <li>
+                        <p>You cannot alter or remove any existing copyright or license notices from the source.</p>
+                        <p><strong>Origin</strong></p>
+                        <ul>
+                            <li>Clause 1 of the IJG License</li>
+                            <li>Clause 1 of the Modified BSD License</li>
+                            <li>Clauses 1 and 3 of the zlib License</li>
+                        </ul>
+                    </li>
+                    <li>
+                        <p>You must add your own copyright notice to the header of each source file you modified, so
+                        others can tell that you modified that file (if there is not an existing copyright header in
+                        that file, then you can simply add a notice stating that you modified the file.)</p>
+                        <p><strong>Origin</strong></p>
+                        <ul>
+                            <li>Clause 1 of the IJG License</li>
+                            <li>Clause 2 of the zlib License</li>
+                        </ul>
+                    </li>
+                    <li>
+                        <p>You must include the IJG README file, and you must not alter any of the copyright or license
+                        text in that file.</p>
+                        <p><strong>Origin</strong></p>
+                        <ul>
+                            <li>Clause 1 of the IJG License</li>
+                        </ul>
+                    </li>
+                </ol>
+            </li>
+            <li>
+                <p>If you are distributing only libjpeg-turbo binaries without the source, or if you are distributing
+                an application that statically links with libjpeg-turbo, then:</p>
+                <ol type="i">
+                    <li>
+                        <p>Your product documentation must include a message stating:</p>
+                        <p>This software is based in part on the work of the Independent JPEG Group.</p>
+                        <p><strong>Origin</strong></p>
+                        <ul>
+                            <li>Clause 2 of the IJG license</li>
+                        </ul>
+                    </li>
+                    <li>
+                        <p>If your binary distribution includes or uses the TurboJPEG API, then your product
+                        documentation must include the text of the Modified BSD License (see below.)</p>
+                        <p><strong>Origin</strong></p>
+                        <ul>
+                            <li>Clause 2 of the Modified BSD License</li>
+                        </ul>
+                    </li>
+                </ol>
+            </li>
+            <li>
+                <p>You cannot use the name of the IJG or The libjpeg-turbo Project or the contributors thereof in
+                advertising, publicity, etc.</p>
+                <p><strong>Origin</strong></p>
+                <ul>
+                    <li>IJG License</li>
+                    <li>Clause 3 of the Modified BSD License</li>
+                </ul>
+            </li>
+            <li>
+                <p>The IJG and The libjpeg-turbo Project do not warrant libjpeg-turbo to be free of defects, nor do we
+                accept any liability for undesirable consequences resulting from your use of the software.</p>
+                <p><strong>Origin</strong></p>
+                <ul>
+                    <li>IJG License</li>
+                    <li>Modified BSD License</li>
+                    <li>zlib License</li>
+                </ul>
+            </li>
+        </ol>
+        <h3>The Modified (3-clause) BSD License</h3>
+        <p>Copyright (C)2009-2019 D. R. Commander. All Rights Reserved. Copyright (C)2015 Viktor Szathmáry. 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>
+            <li>Neither the name of the libjpeg-turbo Project nor the names of its contributors may be used to endorse
+            or promote products derived from this software without specific prior written permission.</li>
+        </ul>
+        <p>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 HOLDERS 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>
+        <h3>Why Three Licenses?</h3>
+        <p>The zlib License could have been used instead of the Modified (3-clause) BSD License, and since the IJG
+        License effectively subsumes the distribution conditions of the zlib License, this would have effectively
+        placed libjpeg-turbo binary distributions under the IJG License. However, the IJG License specifically refers
+        to the Independent JPEG Group and does not extend attribution and endorsement protections to other entities.
+        Thus, it was desirable to choose a license that granted us the same protections for new code that were granted
+        to the IJG for code derived from their software.</p>
+        <h3><a name="a__IJG_License" id="a__IJG_License">IJG JPEG Library License</a></h3>
+        <p>In plain English:</p>
+        <ol>
+            <li>We don't promise that this software works. (But if you find any bugs, please let us know!) </li>
+            <li>You can use this software for whatever you want. You don't have to pay us.</li>
+            <li>You may not pretend that you wrote this software. If you use it in a program, you must acknowledge
+            somewhere in your documentation that you've used the IJG code.</li>
+        </ol>
+        <p>In legalese:</p>
+        <p>The authors make NO WARRANTY or representation, either express or implied, with respect to this software,
+        its quality, accuracy, merchantability, or fitness for a particular purpose.  This software is provided "AS
+        IS", and you, its user, assume the entire risk as to its quality and accuracy.</p>
+        <p>This software is copyright (C) 1991-1998, Thomas G. Lane. All Rights Reserved except as specified below.</p>
+        <p>Permission is hereby granted to use, copy, modify, and distribute this software (or portions thereof) for
+        any purpose, without fee, subject to these conditions:</p>
+        <ol>
+            <li>If any part of the source code for this software is distributed, then this README file must be
+            included, with this copyright and no-warranty notice unaltered; and any additions, deletions, or changes to
+            the original files must be clearly indicated in accompanying documentation.</li>
+            <li>If only executable code is distributed, then the accompanying documentation must state that "this
+            software is based in part on the work of the Independent JPEG Group".</li>
+            <li>Permission for use of this software is granted only if the user accepts full responsibility for any
+            undesirable consequences; the authors accept NO LIABILITY for damages of any kind.</li>
+        </ol>
+        <p>These conditions apply to any software derived from or based on the IJG code, not just to the unmodified
+        library.  If you use our work, you ought to acknowledge us.</p>
+        <p>Permission is NOT granted for the use of any IJG author's name or company name in advertising or publicity
+        relating to this software or products derived from it.  This software may be referred to only as "the
+        Independent JPEG Group's software".</p>
+        <p>We specifically permit and encourage the use of this software as the basis of commercial products, provided
+        that all warranty or liability claims are assumed by the product vendor.</p>
+        <p>ansi2knr.c is included in this distribution by permission of L. Peter Deutsch, sole proprietor of its
+        copyright holder, Aladdin Enterprises of Menlo Park, CA. ansi2knr.c is NOT covered by the above copyright and
+        conditions, but instead by the usual distribution terms of the Free Software Foundation; principally, that you
+        must include source code if you redistribute it.  (See the file ansi2knr.c for full details.)  However, since
+        ansi2knr.c is not needed as part of any program generated from the IJG code, this does not limit you more than
+        the foregoing paragraphs do.</p>
+        <p>The Unix configuration script "configure" was produced with GNU Autoconf. It is copyright by the Free
+        Software Foundation but is freely distributable. The same holds for its supporting scripts (config.guess,
+        config.sub, ltconfig, ltmain.sh).  Another support script, install-sh, is copyright by M.I.T. but is also
+        freely distributable.</p>
+        <p>It appears that the arithmetic coding option of the JPEG spec is covered by patents owned by IBM, AT&T,
+        and Mitsubishi.  Hence arithmetic coding cannot legally be used without obtaining one or more licenses.  For
+        this reason, support for arithmetic coding has been removed from the free JPEG software. (Since arithmetic
+        coding provides only a marginal gain over the unpatented Huffman mode, it is unlikely that very many
+        implementations will support it.) So far as we are aware, there are no patent restrictions on the remaining
+        code.</p>
+        <p>The IJG distribution formerly included code to read and write GIF files. To avoid entanglement with the
+        Unisys LZW patent, GIF reading support has been removed altogether, and the GIF writer has been simplified to
+        produce "uncompressed GIFs".  This technique does not use the LZW algorithm; the resulting GIF files are
+        larger than usual, but are readable by all standard GIF decoders.</p>
+        <p>We are required to state that</p>
+        <blockquote>
+            "The Graphics Interchange Format(c) is the Copyright property of CompuServe Incorporated.  GIF(sm) is a
+            Service Mark property of CompuServe Incorporated."
+        </blockquote>
+        <h3><a name="a__Zlib_license" id="a__Zlib_license">The zlib/libpng License (Zlib)</a></h3>
+        <p>This software is provided 'as-is', without any express or implied warranty. In no event will the authors be
+        held liable for any damages arising from the use of this software.</p>
+        <p>Permission is granted to anyone to use this software for any purpose, including commercial applications, and
+        to alter it and redistribute it freely, subject to the following restrictions:</p>
+        <ol>
+            <li>The origin of this software must not be misrepresented; you must not claim that you wrote the original
+            software. If you use this software in a product, an acknowledgment in the product documentation would be
+            appreciated but is not required.</li>
+            <li>Altered source versions must be plainly marked as such, and must not be misrepresented as being the
+            original software.</li>
+            <li>This notice may not be removed or altered from any source distribution.</li>
+        </ol>
+    </div>
     <div class="LIBLANGTAG">
         <h2>liblangtag</h2>
         <p>The following software may be included in this product: liblangtag. Use of any of this software is governed
commit b28b995f4c39dab9065e766849535616fc79ff09
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 16:51:04 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:42 2019 +0100

    license: add libnumbertext
    
    Change-Id: I0904f1ec25067d685f005a17dfc83f955f7d8ec6

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index ada6a341bb4d..7c044f7407f7 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -786,6 +786,30 @@
         <p><a href="#a__LGPL_version_2_1">Jump to LGPL Version 2.1</a></p>
         <p><a href="#a__MPL_version_2">Jump to MPL Version 2.0</a></p>
     </div>
+    <div class="LIBNUMBERTEXT">
+        <h2>libnumbertext</h2>
+        <p>The following software may be included in this product: libnumbertext. Use of any of this software is
+        governed by the terms of the license below:</p>
+        <p>Copyright 2009–2019 László Németh et al.</p>
+        <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that
+        the following conditions are met:</p>
+        <ol>
+            <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>
+            <li>Neither the name of the copyright holder nor the names of its contributors may be used to endorse or
+            promote products derived from this software without specific prior written permission.</li>
+        </ol>
+        <p>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.</p>
+    </div>
     <div class="ODFGEN">
         <h2>libodfgen</h2>
         <p>The following software may be included in this product: libodfgen. Use of any of this software is governed
commit 52018577b891db9ad52f29630f3aecb0747f7098
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 16:37:00 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:42 2019 +0100

    license: add libpagemaker
    
    Change-Id: Ia097922a06291a8c780c8f44ff1c47962d702cfa

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index beb4406b6943..ada6a341bb4d 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -925,6 +925,12 @@
         glennrp at users.sourceforge.net<br />
         February 3, 2011  </p>
     </div>
+    <div class="PAGEMAKER">
+        <h2>libpagemaker</h2>
+        <p>The following software may be included in this product: libpagemaker. Use of any of this software is governed
+        by the terms of the license below:</p>
+        <p><a href="#a__MPL_version_2">Jump to MPL Version 2.0</a></p>
+    </div>
     <div class="QXP">
         <h2>libqxp</h2>
         <p>The following software may be included in this product: libqxp. Use of any of this software is governed
commit 5e26a1cf726632de5c0c5beaf379c4d26c05e317
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 16:36:03 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:42 2019 +0100

    license: add libqxp
    
    Change-Id: I94cd67947ec28a065f30b7f41e2de5e9627fa407

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index bc2f9e068772..beb4406b6943 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -925,6 +925,12 @@
         glennrp at users.sourceforge.net<br />
         February 3, 2011  </p>
     </div>
+    <div class="QXP">
+        <h2>libqxp</h2>
+        <p>The following software may be included in this product: libqxp. Use of any of this software is governed
+        by the terms of the license below:</p>
+        <p><a href="#a__MPL_version_2">Jump to MPL Version 2.0</a></p>
+    </div>
     <div class="REVENGE">
         <h2>librevenge</h2>
         <p>The following software may be included in this product: librevenge. Use of any of this software is governed
commit dc8261214fd2a70423ecdf112cac8770a023da35
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 16:34:25 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:42 2019 +0100

    license: add librevenge
    
    Change-Id: I1aef3e1bd889ccc344c2a663d3d2e4016314c8a8

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 3732dcfd2c9a..bc2f9e068772 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -925,6 +925,14 @@
         glennrp at users.sourceforge.net<br />
         February 3, 2011  </p>
     </div>
+    <div class="REVENGE">
+        <h2>librevenge</h2>
+        <p>The following software may be included in this product: librevenge. Use of any of this software is governed
+        by the terms of the license below:</p>
+        <p>LGPL v2.1+ / MPL 2</p>
+        <p><a href="#a__LGPL_version_2_1">Jump to LGPL Version 2.1</a></p>
+        <p><a href="#a__MPL_version_2">Jump to MPL Version 2.0</a></p>
+    </div>
     <div class="STAROFFICE">
         <h2>libstaroffice</h2>
         <p>The following software may be included in this product: libstaroffice. Use of any of this software
commit 45151e5adcbdaa747320443aef96d5cab8bae652
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 16:32:24 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:42 2019 +0100

    license: libvisio is MPLv2
    
    Change-Id: I4f73b4dbc71204b0fb16e430a18bb2a7b57ab218

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 2498fd2e261d..3732dcfd2c9a 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -941,10 +941,7 @@
         <h2>libvisio</h2>
         <p>The following software may be included in this product: libvisio. Use of any of this software is governed by
         the terms of the license below:</p>
-        <p>MPL 1.1+ / LGPL v2.1+ / GPL v2+</p>
-        <p><a href="#a__GPL_version_2">Jump to GPL Version 2</a></p>
-        <p><a href="#a__LGPL_version_2_1">Jump to LGPL Version 2.1</a></p>
-        <p><a href="#a__MPL_version_1_1">Jump to MPL Version 1.1</a></p>
+        <p><a href="#a__MPL_version_2">Jump to MPL Version 2.0</a></p>
     </div>
     <div class="WPD">
         <h2>libwpd</h2>
commit 48085944d26634a75da01ccee15b33fc11d7d690
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 16:29:49 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:42 2019 +0100

    license: add libstaroffice
    
    Change-Id: Ib16a822193b4ea8fc91f2c3e03459d153c6706e2

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 6919f97dfcdd..2498fd2e261d 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -925,6 +925,14 @@
         glennrp at users.sourceforge.net<br />
         February 3, 2011  </p>
     </div>
+    <div class="STAROFFICE">
+        <h2>libstaroffice</h2>
+        <p>The following software may be included in this product: libstaroffice. Use of any of this software
+        is governed by the terms of the license below:</p>
+        <p>LGPL v2.1+ / MPL 2</p>
+        <p><a href="#a__LGPL_version_2_1">Jump to LGPL Version 2.1</a></p>
+        <p><a href="#a__MPL_version_2">Jump to MPL Version 2.0</a></p>
+    </div>
     <div class="FIREBIRD">
         <h2>LibTomMath</h2>
         <p>The following software may be included in this product: LibTomMath. LibTomMath is public domain.</p>
commit 0827d92a75e2f72602d09034b4dc79a527727c62
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 16:25:44 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:41 2019 +0100

    license: add LibTomMath
    
    Change-Id: Id0d3f12e6d5bacaba910f88227f2f9aea69817ad

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 87fc9aa34000..6919f97dfcdd 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -925,6 +925,10 @@
         glennrp at users.sourceforge.net<br />
         February 3, 2011  </p>
     </div>
+    <div class="FIREBIRD">
+        <h2>LibTomMath</h2>
+        <p>The following software may be included in this product: LibTomMath. LibTomMath is public domain.</p>
+    </div>
     <div class="VISIO">
         <h2>libvisio</h2>
         <p>The following software may be included in this product: libvisio. Use of any of this software is governed by
commit e3f4e15a2238c4ee378351c54a6a36d29a9a587e
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 16:17:57 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:41 2019 +0100

    license: add libzmf
    
    Change-Id: I5e0332e422d39e3c7bda7eab3c2bbd1927f094b0

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index e09a93209bca..87fc9aa34000 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1016,6 +1016,12 @@
         <p>Except as contained in this notice, the name of the authors shall not be used in advertising or otherwise to
         promote the sale, use or other dealings in this Software without prior written authorization from him.</p>
     </div>
+    <div class="ZMF">
+        <h2>libzmf</h2>
+        <p>The following software may be included in this product: libzmf. Use of any of this software is governed by
+        the terms of the license below:</p>
+        <p><a href="#a__MPL_version_2">Jump to MPL Version 2.0</a></p>
+    </div>
     <div class="LCMS2">
         <h2>Little CMS (lcms2)</h2>
         <p>The following software may be included in this product: Little CMS (lcms2). Use of any of this software is
commit 98c4ba5efba43d4d9b8e145b37351f3ca9a55f58
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 16:13:50 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:41 2019 +0100

    license: add MariaDB Connector/C
    
    Change-Id: I5839bb9cc70dd56fc212b0fe6910640b67a4cfa5

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 7349555bd12a..e09a93209bca 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1039,6 +1039,12 @@
         the terms of the license below:</p>
         <p><a href="#a__LGPL_version_2_1">Jump to LGPL Version 2.1</a></p>
     </div>
+    <div class="MARIADB_CONNECTOR_C">
+        <h2>MariaDB Connector/C</h2>
+        <p>The following software may be included in this product: MariaDB Connector/C. Use of any of this software is
+        governed by the terms of the license below:</p>
+        <p><a href="#a__LGPL_version_2_1">Jump to LGPL Version 2.1</a></p>
+    </div>
     <div class="MDDS">
         <h2>mdds</h2>
         <p>The following software may be included in this product: mdds. Use of any of this software is governed by the
commit 635b2b3bd293941ded179b5e05aba4082a52a703
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 16:08:11 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:41 2019 +0100

    license: add mDNSResponder
    
    Change-Id: Id9fcdd9c270c62835a6dec7916b7c475b989bf97

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 2e512e3cbb06..7349555bd12a 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1056,6 +1056,18 @@
         ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
         OTHER DEALINGS IN THE SOFTWARE.</p>
     </div>
+    <div class="MDNSRESPONDER">
+        <h2>mDNSResponder</h2>
+        <p>The following software may be included in this product: mDNSResponder. The majority of the source code in
+        the mDNSResponder project is licensed under the terms of the Apache License, Version 2.0.</p>
+        <p><a href="#a__Apache_License_version_2_0">Jump to Apache License Version 2.0</a></p>
+        <p>To accommodate license compatibility with the widest possible range of client code licenses, the shared
+        library code, which is linked at runtime into the same address space as the client using it, is licensed under
+        the terms of the "Three-Clause BSD License".</p>
+        <p>The Linux Name Service Switch code, contributed by National ICT Australia Ltd (NICTA) is licensed under the
+        terms of the NICTA Public Software Licence (which is substantially similar to the "Three-Clause BSD License",
+        with some additional language pertaining to Australian law).</p>
+    </div>
     <div class="WNT">
         <h2>Microsoft Visual C++ 2015 Runtime Libraries</h2>
         <p>The following software may be included in this product: Microsoft Visual C++ 2015 Runtime Libraries. Use of
commit 330229078dd2251b71c309413f9f472c7a047149
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 16:01:16 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:41 2019 +0100

    license: add ownCloud Android Library
    
    Change-Id: If39bf8f95c5c9f2a41bf376225a4d68af0e47022

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 9cfce4dfbea3..2e512e3cbb06 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1306,6 +1306,23 @@
         changed. i.e. this code cannot simply be copied and put under another distribution license [including the GNU
         Public License.]</p>
     </div>
+    <div class="OWNCLOUD_ANDROID_LIB">
+        <h2>ownCloud Android Library</h2>
+        <p>The following software may be included in this product: ownCloud Android Library. ownCloud Android Library
+        is available under MIT license.</p>
+        <p>Copyright (C) 2019 ownCloud GmbH. Copyright (C) 2012 Bartek Przybylski</p>
+        <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+        documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+        the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+        and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
+        <p>The above copyright notice and this permission notice shall be included in all copies or substantial
+        portions of the Software.</p>
+        <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+        LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+        SHALL THE AUTHORS OR COPYRIGHT HOLDERSBE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+        OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+        DEALINGS IN THE SOFTWARE.</p>
+    </div>
     <div class="PDFIUM">
         <h2>PDFium</h2>
         <p>The following software may be included in this product: PDFium. Use of any of this software is governed by
commit 8c8504bf384806eebb86036c551e8699bc37f333
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 15:55:27 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:41 2019 +0100

    license: check if BUILD_TYPE contains XSLTML
    
    Change-Id: I6b5a3111e1ece0c014cf2c12d1b0dca787c15ae6

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index bb1d8ef3dda2..9cfce4dfbea3 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1769,29 +1769,31 @@
         <p>Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or otherwise
         to promote the sale, use or other dealings in this Software without prior written authorization from him.</p>
     </div>
-    <h2>XSLT MathML Library</h2>
-    <p>The following software may be included in this product: XSLT MathML Library. Use of any of this software is
-    governed by the terms of the license below:</p>
-    <h3>Copyright</h3>
-    <p>Copyright (C) 2001-2003 Vasil Yaroshevich</p>
-    <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-    documentation files (the ``Software''), to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
-    <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of
-    the Software.</p>
-    <p>Except as contained in this notice, the names of individuals credited with contribution to this software shall
-    not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior
-    written authorization from the individuals in question.</p>
-    <p>Any stylesheet derived from this Software that is publicly distributed will be identified with a different name
-    and the version strings in any derived Software will be changed so that no possibility of confusion between the
-    derived package and this Software will exist.</p>
-    <h3>Warranty</h3>
-    <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-    THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL NORMAN
-    WALSH OR ANY OTHER CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-    IN THE SOFTWARE.</p>
+    <div class="XSLTML">
+        <h2>XSLT MathML Library</h2>
+        <p>The following software may be included in this product: XSLT MathML Library. Use of any of this software is
+        governed by the terms of the license below:</p>
+        <h3>Copyright</h3>
+        <p>Copyright (C) 2001-2003 Vasil Yaroshevich</p>
+        <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+        documentation files (the ``Software''), to deal in the Software without restriction, including without limitation
+        the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+        permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
+        <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+        the Software.</p>
+        <p>Except as contained in this notice, the names of individuals credited with contribution to this software shall
+        not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior
+        written authorization from the individuals in question.</p>
+        <p>Any stylesheet derived from this Software that is publicly distributed will be identified with a different name
+        and the version strings in any derived Software will be changed so that no possibility of confusion between the
+        derived package and this Software will exist.</p>
+        <h3>Warranty</h3>
+        <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+        THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL NORMAN
+        WALSH OR ANY OTHER CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+        CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+        IN THE SOFTWARE.</p>
+    </div>
     <div class="ZLIB">
         <h2>zlib</h2>
         <p>The following software may be included in this product: zlib. Use of any of this software is governed by the
commit 5167167a8ccb96910a0285e5133808c7946b87ab
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 13:28:18 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:41 2019 +0100

    license: add Epoxy
    
    Change-Id: I6076b47071f4b921d7b114829f40d261c35ee3bb

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 1d32dff4c8aa..bb1d8ef3dda2 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -207,6 +207,42 @@
         <p><a href="#a__LGPL_version_2_1">Jump to LGPL Version 2.1</a></p>
         <p><a href="#a__Apache_License_version_2_0">Jump to Apache License Version 2.0</a></p>
     </div>
+    <div class="EPOXY">
+        <h2>Epoxy</h2>
+        <p>The following software may be included in this product: epoxy.</p>
+        <p>The libepoxy project code is covered by the MIT license:</p>
+        <blockquote>
+            <p>Copyright © 2013-2014 Intel Corporation</p>
+            <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+            associated documentation files (the "Software"), to deal in the Software without restriction, including
+            without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+            copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
+            following conditions:</p>
+            <p>The above copyright notice and this permission notice (including the next paragraph) shall be included
+            in all copies or substantial portions of the Software.</p>
+            <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+            LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+            EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+            IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+            USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+        </blockquote>
+        <p>The generated code is derived from Khronos's xml files, which appear under the following license:</p>
+        <blockquote>
+            <p>Copyright (c) 2013 The Khronos Group Inc.</p>
+            <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and/or
+            associated documentation files (the "Materials"), to deal in the Materials without restriction, including
+            without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+            copies of the Materials, and to permit persons to whom the Materials are furnished to do so, subject to the
+            following conditions:</p>
+            <p>The above copyright notice and this permission notice shall be included in all copies or substantial
+            portions of the Materials.</p>
+            <p>THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+            LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+            EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+            IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR
+            THE USE OR OTHER DEALINGS IN THE MATERIALS.</p>
+        </blockquote>
+    </div>
     <div class="EXPAT">
         <h2>expat XML Parser Toolkit</h2>
         <p>The following software may be included in this product: expat XML Parser Toolkit. Use of any of this
commit abb1c0aa093057d08710da01a02eaf885e80729e
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 13:16:35 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:41 2019 +0100

    license: add CLEW, the OpenCL Extension Wrangler
    
    Change-Id: I784261faa39d1b0520ee483c4249f6e040d80771

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index b8e0fe6259b1..1d32dff4c8aa 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -179,6 +179,25 @@
         available under the GNU General Public License (GPL), for example. Again, please see the opening comment of
         each file for copyright and licensing information.</p>
     </div>
+    <div class="OPENCL">
+        <h2>CLEW</h2>
+        <p>The following software may be included in this product: CLEW (OpenCL Extension Wrangler). Use of any of
+        this software is governed by the terms of the license below:</p>
+        <p>Boost Software License - Version 1.0 - August 17th, 2003</p>
+        <p>Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software
+        and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute,
+        execute, and transmit the Software, and to prepare derivative works of the Software, and to permit
+        third-parties to whom the Software is furnished to do so, all subject to the following:</p>
+        <p>The copyright notices in the Software and this entire statement, including the above license grant, this
+        restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part,
+        and all derivative works of the Software, unless such copies or derivative works are solely in the form of
+        machine-executable object code generated by a source language processor.</p>
+        <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+        LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN
+        NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER
+        LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+        THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+    </div>
     <div class="CLUCENE">
         <h2>CLucene</h2>
         <p>The following software may be included in this product: CLucene. Use of any of this software is governed by
commit 6c51e27e0df5eb51e6d2160f53c51841df34681f
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 13:05:14 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:41 2019 +0100

    license: re-format SVGPathSeg + fix a link
    
    Change-Id: I65bc0d30df525113a7b28504f105dc1cf4b168ee

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 934fe9c332ee..b8e0fe6259b1 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1547,34 +1547,25 @@
     <p>The following software may be included in this product: SVGPathSeg polyfill. Use of any of this software is
     governed by the terms of the license below:</p>
     <p>Copyright 2015 The Chromium Authors. All rights reserved.</p>
-    <p>The Chromium Authors can be found at</p>
-    <p>http://src.chromium.org/svn/trunk/src/AUTHORS</p>
-    <p> </p>
-    <p>Redistribution and use in source and binary forms, with or without</p>
-    <p>modification, are permitted provided that the following conditions are</p>
-    <p>met:</p>
-    <p> </p>
-    <p>   * Redistributions of source code must retain the above copyright</p>
-    <p>notice, this list of conditions and the following disclaimer.</p>
-    <p>   * Redistributions in binary form must reproduce the above</p>
-    <p>copyright notice, this list of conditions and the following disclaimer</p>
-    <p>in the documentation and/or other materials provided with the</p>
-    <p>distribution.</p>
-    <p>   * Neither the name of Google Inc. nor the names of its</p>
-    <p>contributors may be used to endorse or promote products derived from</p>
-    <p>this software without specific prior written permission.</p>
-    <p> </p>
-    <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</p>
-    <p>AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</p>
-    <p>LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</p>
-    <p>A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</p>
-    <p>OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</p>
-    <p>SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</p>
-    <p>LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</p>
-    <p>DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</p>
-    <p>THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</p>
-    <p>(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</p>
-    <p>OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+    <p>The Chromium Authors can be found at <a href=
+    "https://src.chromium.org/viewvc/chrome/trunk/src/AUTHORS">https://src.chromium.org/viewvc/chrome/trunk/src/AUTHORS</a></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>
+        <li>Neither the name of Google Inc. nor the names of its contributors may be used to endorse or promote
+        products derived from this software without specific prior written permission.</li>
+    </ul>
+    <p>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 OWNER 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 class="WNT">
         <h2>TWAIN</h2>
         <p>The following software may be included in this product: TWAIN. Use of any of this software is governed by the
commit c87022b0b5afbad0e8d9d86e6fc713ee3abd79b4
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 12:55:12 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:41 2019 +0100

    license: check if BUILD_TYPE contains SANE
    
    Change-Id: I713519586917eb0ffdd4c515f3813731f085c750

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 9dbf8b4c80b4..934fe9c332ee 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1530,17 +1530,19 @@
         the terms of the license below:</p>
         <p><a href="#a__MPL_version_1_1">Jump to MPL Version 1.1</a></p>
     </div>
-    <h2>SANE</h2>
-    <p>The following software may be included in this product: SANE. Use of any of this software is governed by the
-    terms of the license below:</p>
-    <p>sane - Scanner Access Now Easy. Copyright (C) 1997-1999 David Mosberger-Tang and Andreas Beck</p>
-    <p>This file is part of the SANE package.</p>
-    <p>This file is in the public domain. You may use and modify it as you see fit, as long as this copyright message
-    is included and that there is an indication as to what modifications have been made (if any).</p>
-    <p>SANE 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.</p>
-    <p>This file declares SANE application interface. See the SANE standard for a detailed explanation of the
-    interface.</p>
+    <div class="SANE">
+        <h2>SANE</h2>
+        <p>The following software may be included in this product: SANE. Use of any of this software is governed by the
+        terms of the license below:</p>
+        <p>sane - Scanner Access Now Easy. Copyright (C) 1997-1999 David Mosberger-Tang and Andreas Beck</p>
+        <p>This file is part of the SANE package.</p>
+        <p>This file is in the public domain. You may use and modify it as you see fit, as long as this copyright message
+        is included and that there is an indication as to what modifications have been made (if any).</p>
+        <p>SANE 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.</p>
+        <p>This file declares SANE application interface. See the SANE standard for a detailed explanation of the
+        interface.</p>
+    </div>
     <h2>SVGPathSeg polyfill</h2>
     <p>The following software may be included in this product: SVGPathSeg polyfill. Use of any of this software is
     governed by the terms of the license below:</p>
commit 849e919dc10b9fa21fc6c4f273b1c71cadb012ae
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Mar 25 12:51:26 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 25 22:34:40 2019 +0100

    license: TWAIN is used on Windows only
    
    Change-Id: I74182090478cf4139a9676d1f3d714c996f631ee

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 38908694a172..9dbf8b4c80b4 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1573,50 +1573,52 @@
     <p>THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</p>
     <p>(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</p>
     <p>OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
-    <h2>TWAIN</h2>
-    <p>The following software may be included in this product: TWAIN. Use of any of this software is governed by the
-    terms of the license below:</p>
-    <h3>The TWAIN License</h3>
-    <p>The TWAIN Working Group grants customer ("Customer") the worldwide, royalty-free, non-exclusive license to
-    reproduce and distribute the software and documentation of the TWAIN toolkit ("TWAIN Toolkit"). The TWAIN Toolkit
-    was designed to be used by third parties to assist them in becoming compliant with the TWAIN standard, but it has
-    not been developed to the standards of a commercial product. Consequently, the TWAIN toolkit is provided AS IS
-    without any warranty. THE TWAIN Working Group disclaims all warranties in the TWAIN toolkit whether implied,
-    express or statutory, including, without limitation, the implied warranties of merchantability, non infringement of
-    third party rights and fitness for a particular purpose. The TWAIN Working Group disclaims all liability for
-    damages, whether direct, indirect, special, incidental, or consequential, arising from the reproduction,
-    distribution, modification, or other use of the TWAIN Toolkit.</p>
-    <p>As a condition of this license, Customer agrees to include in software programs based in whole or in part on the
-    TWAIN Toolkit the following provisions in (i) the header or similar file in such software and (ii) prominently in
-    its documentation and to require its sublicensees to include these provisions in similar locations: The TWAIN
-    Toolkit is distributed as is. The developer and distributors of the TWAIN Toolkit expressly disclaim all implied,
-    express or statutory warranties including, without limitation, the implied warranties of merchantability, non
-    infringement of third party rights and fitness for a particular purpose. Neither the developers nor the
-    distributors will be liable for damages, whether direct, indirect, special, incidental, or consequential, as a
-    result of the reproduction, modification, distribution or other use of the TWAIN Toolkit.</p>
-    <h2>Unicode CLDR data repository</h2>
-    <p>The following software may be included in this product: Unicode's CLDR data repository. Use of any of this
-    software is governed by the terms of the license below:</p>
-    <p>Copyright 1991-2005 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in <a href=
-    "http://www.unicode.org/copyright.html">http://www.unicode.org/copyright.html</a>.</p>
-    <p>Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any
-    associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software")
-    to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom
-    the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this
-    permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and
-    this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File
-    or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or
-    software has been modified.</p>
-    <p>THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
-    PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
-    ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-    PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-    WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.</p>
-    <p>Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise
-    to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of
-    the copyright holder.</p>
+    <div class="WNT">
+        <h2>TWAIN</h2>
+        <p>The following software may be included in this product: TWAIN. Use of any of this software is governed by the
+        terms of the license below:</p>
+        <h3>The TWAIN License</h3>
+        <p>The TWAIN Working Group grants customer ("Customer") the worldwide, royalty-free, non-exclusive license to
+        reproduce and distribute the software and documentation of the TWAIN toolkit ("TWAIN Toolkit"). The TWAIN Toolkit
+        was designed to be used by third parties to assist them in becoming compliant with the TWAIN standard, but it has
+        not been developed to the standards of a commercial product. Consequently, the TWAIN toolkit is provided AS IS
+        without any warranty. THE TWAIN Working Group disclaims all warranties in the TWAIN toolkit whether implied,
+        express or statutory, including, without limitation, the implied warranties of merchantability, non infringement of
+        third party rights and fitness for a particular purpose. The TWAIN Working Group disclaims all liability for
+        damages, whether direct, indirect, special, incidental, or consequential, arising from the reproduction,
+        distribution, modification, or other use of the TWAIN Toolkit.</p>
+        <p>As a condition of this license, Customer agrees to include in software programs based in whole or in part on the
+        TWAIN Toolkit the following provisions in (i) the header or similar file in such software and (ii) prominently in
+        its documentation and to require its sublicensees to include these provisions in similar locations: The TWAIN
+        Toolkit is distributed as is. The developer and distributors of the TWAIN Toolkit expressly disclaim all implied,
+        express or statutory warranties including, without limitation, the implied warranties of merchantability, non
+        infringement of third party rights and fitness for a particular purpose. Neither the developers nor the
+        distributors will be liable for damages, whether direct, indirect, special, incidental, or consequential, as a
+        result of the reproduction, modification, distribution or other use of the TWAIN Toolkit.</p>
+        <h2>Unicode CLDR data repository</h2>
+        <p>The following software may be included in this product: Unicode's CLDR data repository. Use of any of this
+        software is governed by the terms of the license below:</p>
+        <p>Copyright 1991-2005 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in <a href=
+        "http://www.unicode.org/copyright.html">http://www.unicode.org/copyright.html</a>.</p>
+        <p>Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any
+        associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software")
+        to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy,
+        modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom
+        the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this
+        permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and
+        this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File
+        or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or
+        software has been modified.</p>
+        <p>THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+        BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
+        PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
+        ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+        PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+        WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.</p>
+        <p>Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise
+        to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of
+        the copyright holder.</p>
+    </div>
     <h2>UnixODBC</h2>
     <p>The following software may be included in this product: unixODBC. Use of any of this software is governed by the
     terms of the license below:</p>


More information about the Libreoffice-commits mailing list