readlicense_oo/license/LICENSE      |   24 ------------------------
 readlicense_oo/license/LICENSE.fodt |   10 +---------
 2 files changed, 1 insertion(+), 33 deletions(-)

New commits:
commit bca6b706dfa092ed5d2c9ad58c18c9e598d6e2f1
Author: Yousuf Philips <[email protected]>
Date:   Wed Jan 31 02:47:14 2018 +0400

    tdf#103080 Remove Open Sans and PT_Serif licenses
    
    Change-Id: I024669ca552c00fd0b62c4eb25bccb88666295de
    Reviewed-on: https://gerrit.libreoffice.org/48941
    Tested-by: Jenkins <[email protected]>
    Reviewed-by: Yousuf Philips <[email protected]>

diff --git a/readlicense_oo/license/LICENSE b/readlicense_oo/license/LICENSE
index 7ebab994a6f8..3ce5873c9aeb 100644
--- a/readlicense_oo/license/LICENSE
+++ b/readlicense_oo/license/LICENSE
@@ -3111,30 +3111,6 @@ Linux Libertine G and Linux Biolinum G
    OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
    SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
 
-Open Sans
-
-   The following software may be included in this product: Open Sans
-   fonts. Use of any of this software is governed by the terms of the
-   license below:
-
-   See Apache License Version 2.0 below
-
-PT Serif
-
-   The following software may be included in this product: PT Serif fonts.
-   Use of any of this software is governed by the terms of the license
-   below:
-
-   Copyright (c) 2010, ParaType Ltd.
-   (http://www.paratype.com/public), with Reserved Font Names "PT
-   Sans", "PT Serif" and "ParaType".
-
-   This Font Software is licensed under the SIL Open Font License, Version
-   1.1. This license is copied below, and is also available with a
-   FAQ at: http://scripts.sil.org/OFL
-
-   See SIL Open Font License, Version 1.1 below
-
 Source Code Pro
 
    The following software may be included in this product: Source Code Pro
diff --git a/readlicense_oo/license/LICENSE.fodt 
b/readlicense_oo/license/LICENSE.fodt
index bf25468c4f97..de7ff7ef9052 100644
--- a/readlicense_oo/license/LICENSE.fodt
+++ b/readlicense_oo/license/LICENSE.fodt
@@ -4221,14 +4221,6 @@
    <text:p text:style-name="Standard">5) The Font Software, modified or 
unmodified, in part or in whole, must be distributed using this license, and 
may not be distributed under any other license.</text:p>
    <text:p text:style-name="Standard">TERMINATION This license becomes null 
and void if any of the above conditions are not met.</text:p>
    <text:p text:style-name="Standard">DISCLAIMER THE FONT SOFTWARE IS PROVIDED 
&quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING 
BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN 
NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR 
CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM 
OTHER DEALINGS IN THE FONT SOFTWARE.</text:p>
-   <text:h text:style-name="P89" text:outline-level="2">Open Sans</text:h>
-   <text:p text:style-name="P7">The following software may be included in this 
product: <text:span text:style-name="T6">Open Sans</text:span> fonts. Use of 
any of this software is governed by the terms of the license below:</text:p>
-   <text:p text:style-name="P7"><text:a xlink:type="simple" 
xlink:href="#11.Apache License|outline" text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link">Jump to Apache License 
Version 2.0</text:a></text:p>
-   <text:h text:style-name="P89" 
text:outline-level="2"><text:soft-page-break/>PT Serif</text:h>
-   <text:p text:style-name="P6">The following software may be included in this 
product: <text:span text:style-name="T6">PT Serif</text:span> fonts. Use of any 
of this software is governed by the terms of the license below:</text:p>
-   <text:p text:style-name="P7"><text:span text:style-name="T6">Copyright (c) 
2010, ParaType Ltd. (</text:span><text:a xlink:type="simple" 
xlink:href="http://www.paratype.com/public"; text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link"><text:span 
text:style-name="T6">http://www.paratype.com/public</text:span></text:a><text:span
 text:style-name="T6">), with Reserved Font Names &quot;PT Sans&quot;, &quot;PT 
Serif&quot; and &quot;ParaType&quot;.</text:span></text:p>
-   <text:p text:style-name="P6">This Font Software is licensed under the SIL 
Open Font License, Version 1.1. This license is copied <text:a 
xlink:type="simple" xlink:href="#13.SIL OPEN FONT LICENSE Version 1.1 - 26 
February 2007|outline" text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link">below</text:a>, and is 
also available with a FAQ at: <text:a xlink:type="simple" 
xlink:href="http://scripts.sil.org/OFL"; text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link">http://scripts.sil.org/OFL</text:a></text:p>
-   <text:p text:style-name="P7"><text:a xlink:type="simple" 
xlink:href="#13.SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007|outline" 
text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link"><text:span 
text:style-name="T6">Jump to SIL Open Font License, Version 
1.1</text:span></text:a></text:p>
    <text:h text:style-name="P90" text:outline-level="2">Source Code 
Pro</text:h>
    <text:p text:style-name="P6">The following software may be included in this 
product: <text:span text:style-name="T5">Source Code Pro</text:span> fonts. Use 
of any of this software is governed by the terms of the license below:</text:p>
    <text:p text:style-name="P7"><text:span text:style-name="T6">Copyright 
2010, 2012 Adobe Systems Incorporated (</text:span><text:a xlink:type="simple" 
xlink:href="http://www.adobe.com/"; text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link"><text:span 
text:style-name="T6">http://www.adobe.com/</text:span></text:a><text:span 
text:style-name="T6">), with Reserved Font Name &apos;Source&apos;. All Rights 
Reserved. Source is a trademark of Adobe Systems Incorporated in the United 
States and/or other countries.</text:span></text:p>
@@ -6701,4 +6693,4 @@
    <text:p text:style-name="Standard">Creative Commons may be contacted at 
<text:a xlink:type="simple" xlink:href="http://creativecommons.org/"; 
text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link">http://creativecommons.org/</text:a>.</text:p>
   </office:text>
  </office:body>
-</office:document>
\ No newline at end of file
+</office:document>
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to