From cc3e7bdf793d40b856da14585f003780c2655b1a Mon Sep 17 00:00:00 2001
From: Roland Ernst <rcrernst@gmail.com>
Date: Mon, 27 Jan 2020 23:25:18 +0100
Subject: [PATCH 3/3] Install missing droid fonts
Pull request 73 and 74 against packaging/deb are still valid on master.
See Debian/Ubuntu: Install Droid fonts instead of symlinking. #74
This commit changes the debian/ubuntu packaging to install mythtv's
droid fonts instead of relying on fonts that were deprecated two years
ago and replaced by dejavu fonts that don't look right.
---
deb/debian/mythtv-common.install | 1 +
deb/debian/mythtv-common.links | 7 -------
deb/debian/rules | 1 -
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/deb/debian/mythtv-common.install b/deb/debian/mythtv-common.install
index 4289d5f..f9dc45a 100644
a
|
b
|
usr/bin/mythutil |
8 | 8 | usr/share/mythtv/*.xml |
9 | 9 | usr/share/mythtv/*.pl |
10 | 10 | usr/share/mythtv/locales |
| 11 | usr/share/mythtv/fonts/Droid*.ttf |
11 | 12 | usr/share/mythtv/fonts/Tiresias*.ttf |
12 | 13 | usr/share/mythtv/internetcontent |
13 | 14 | usr/share/mythtv/metadata |
diff --git a/deb/debian/mythtv-common.links b/deb/debian/mythtv-common.links
index d341308..f4dfb0c 100644
a
|
b
|
|
1 | | usr/share/fonts/truetype/droid/DroidSans.ttf usr/share/mythtv/fonts/DroidSans.ttf |
2 | | usr/share/fonts/truetype/droid/DroidSerif-Bold.ttf usr/share/mythtv/fonts/DroidSerif-Bold.ttf |
3 | | usr/share/fonts/truetype/droid/DroidSerif-Regular.ttf usr/share/mythtv/fonts/DroidSerif-Regular.ttf |
4 | | usr/share/fonts/truetype/droid/DroidSans-Bold.ttf usr/share/mythtv/fonts/DroidSans-Bold.ttf |
5 | | usr/share/fonts/truetype/droid/DroidSansMono.ttf usr/share/mythtv/fonts/DroidSansMono.ttf |
6 | | usr/share/fonts/truetype/droid/DroidSerif-Italic.ttf usr/share/mythtv/fonts/DroidSerif-Italic.ttf |
7 | | usr/share/fonts/truetype/droid/DroidSerif-BoldItalic.ttf usr/share/mythtv/fonts/DroidSerif-BoldItalic.ttf |
8 | 1 | usr/share/fonts/truetype/freefont/FreeSans.ttf usr/share/mythtv/fonts/FreeSans.ttf |
9 | 2 | usr/share/fonts/truetype/freefont/FreeMono.ttf usr/share/mythtv/fonts/FreeMono.ttf |
10 | 3 | usr/share/fonts/truetype/freefont/FreeSansBold.ttf usr/share/mythtv/fonts/FreeSansBold.ttf |
diff --git a/deb/debian/rules b/deb/debian/rules
index 544337d..bb76a28 100755
a
|
b
|
override_dh_install: |
139 | 139 | cp debian/20-mythweb.ini ${buildroot}/etc/php/7.0/apache2/conf.d; \ |
140 | 140 | dh_install -Xusr/share/mythtv/fonts/Free \ |
141 | 141 | -Xusr/share/mythtv/fonts/Purisa \ |
142 | | -Xusr/share/mythtv/fonts/Droid \ |
143 | 142 | -Xusr/share/mythtv/fonts/texgyrechorus \ |
144 | 143 | -Xusr/lib/libmythzmq.la \ |
145 | 144 | -Xusr/share/mythtv/fonts/tiresias_gpl3.txt \ |