fonts-Missing_Fonts: Fix license information in LICENSE.

This commit is contained in:
Sebastian Lackner 2015-11-22 22:37:48 +01:00
parent 923b875122
commit 5decc603f2

View File

@ -1,4 +1,4 @@
From 716e01da20f456686805373f13860410e1d65513 Mon Sep 17 00:00:00 2001
From a6889ee23ad09cf77c0f8b45d060fadfe2095719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 20 Dec 2014 23:10:38 +0100
Subject: Add licenses for fonts as separate files.
@ -8,8 +8,8 @@ Subject: Add licenses for fonts as separate files.
COPYING.cour | 65 ++++++
COPYING.msyh | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
COPYING.times | 65 ++++++
LICENSE | 27 ++-
5 files changed, 895 insertions(+), 1 deletion(-)
LICENSE | 32 ++-
5 files changed, 900 insertions(+), 1 deletion(-)
create mode 100644 COPYING.arial
create mode 100644 COPYING.cour
create mode 100644 COPYING.msyh
@ -909,7 +909,7 @@ index 0000000..b756428
+Copyright © 2007-2011 Red Hat, Inc. All rights reserved. LIBERATION is a
+trademark of Red Hat, Inc.
diff --git a/LICENSE b/LICENSE
index 6dbf8c0..3f4841a 100644
index 6dbf8c0..9a9fe47 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,10 +1,15 @@
@ -929,7 +929,7 @@ index 6dbf8c0..3f4841a 100644
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,3 +20,23 @@ A copy of the GNU Lesser General Public License is included in the
@@ -15,3 +20,28 @@ A copy of the GNU Lesser General Public License is included in the
Wine distribution in the file COPYING.LIB. If you did not receive this
copy, write to the Free Software Foundation, Inc., 51 Franklin St,
Fifth Floor, Boston, MA 02110-1301, USA.
@ -946,13 +946,18 @@ index 6dbf8c0..3f4841a 100644
+ The Liberation Sans font is licensed under the
+ LIBERATION FONT SOFTWARE LICENSE. See COPYING.arial.
+
+ * fonts/times.ttf and fonts/times.sfd
+ The Liberation Serif font is licensed under the
+ LIBERATION FONT SOFTWARE LICENSE. See COPYING.times.
+
+ * fonts/cour.ttf and fonts/cour.sfd
+ The Liberation Mono font is licensed under the
+ LIBERATION FONT SOFTWARE LICENSE. See COPYING.cour.
+
+ * fonts/msyh.ttf and fonts/msyh.sfd
+ The WenQuanYi Micro Hei font is licensed under both the APACHE 2
+ license and GPLv3. See COPYING.msyh for GPLv3.
+
+ * fonts/cour.ttf and fonts/cour.sfd
+ The Courier Prime font is licensed under the OFLv1.1.
+ See COPYING.cour.
--
2.5.0
2.6.2