Rebase against 9d897b73a877e5eaae26df87930c951ff8273c14

patches/fonts-Missing_Fonts/0005-Add-licenses-for-fonts-as-separate-files.patch

@@ -1,15 +1,15 @@
-From a6889ee23ad09cf77c0f8b45d060fadfe2095719 Mon Sep 17 00:00:00 2001
+From 7c3b389af5d0e6e7317bff0466815e40a2b498b4 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.
+Subject: [PATCH] Add licenses for fonts as separate files.
 
 ---
  COPYING.arial |  65 ++++++
  COPYING.cour  |  65 ++++++
  COPYING.msyh  | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  COPYING.times |  65 ++++++
- LICENSE       |  32 ++-
- 5 files changed, 900 insertions(+), 1 deletion(-)
+ LICENSE       |  25 +++
+ 5 files changed, 894 insertions(+)
  create mode 100644 COPYING.arial
  create mode 100644 COPYING.cour
  create mode 100644 COPYING.msyh
@@ -909,27 +909,10 @@ 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..9a9fe47 100644
+index 765b9c3..6fdc83c 100644
 --- a/LICENSE
 +++ b/LICENSE
-@@ -1,10 +1,15 @@
-+All files unless stated otherwise (see exceptions below) are licensed
-+under the following terms.
-+
-+-----------------------------------------------------------------------
-+
- Copyright (c) 1993-2017 the Wine project authors (see the file AUTHORS
- for a complete list)
- 
- Wine is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the
- Free Software Foundation; either version 2.1 of the License, or (at
--your option) any later version. 
-+your option) any later version.
- 
- 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,28 @@ A copy of the GNU Lesser General Public License is included in the
+@@ -15,3 +15,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.
@@ -959,5 +942,5 @@ index 6dbf8c0..9a9fe47 100644
 +      license and GPLv3. See COPYING.msyh for GPLv3.
 +
 -- 
-2.6.2
+1.9.1