Skip to content

Commit

Permalink
Debian/Ubuntu: Install Droid fonts instead of symlinking.
Browse files Browse the repository at this point in the history
The packaging/deb scripts create symlinks to Droid fonts that are no
longer available on Debian or Ubuntu. However, mythtv already has the
Droid fonts and installs them when mythtv is built from source.
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.
  • Loading branch information
faginbagin authored and superm1 committed Jul 3, 2018
1 parent 1b9d765 commit 7dbe026
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
1 change: 1 addition & 0 deletions deb/debian/mythtv-common.install
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ usr/bin/mythutil
usr/share/mythtv/*.xml
usr/share/mythtv/*.pl
usr/share/mythtv/locales
usr/share/mythtv/fonts/Droid*.ttf
usr/share/mythtv/fonts/Tiresias*.ttf
usr/share/mythtv/internetcontent
usr/share/mythtv/metadata
Expand Down
7 changes: 0 additions & 7 deletions deb/debian/mythtv-common.links
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
usr/share/fonts/truetype/droid/DroidSans.ttf usr/share/mythtv/fonts/DroidSans.ttf
usr/share/fonts/truetype/droid/DroidSerif-Bold.ttf usr/share/mythtv/fonts/DroidSerif-Bold.ttf
usr/share/fonts/truetype/droid/DroidSerif-Regular.ttf usr/share/mythtv/fonts/DroidSerif-Regular.ttf
usr/share/fonts/truetype/droid/DroidSans-Bold.ttf usr/share/mythtv/fonts/DroidSans-Bold.ttf
usr/share/fonts/truetype/droid/DroidSansMono.ttf usr/share/mythtv/fonts/DroidSansMono.ttf
usr/share/fonts/truetype/droid/DroidSerif-Italic.ttf usr/share/mythtv/fonts/DroidSerif-Italic.ttf
usr/share/fonts/truetype/droid/DroidSerif-BoldItalic.ttf usr/share/mythtv/fonts/DroidSerif-BoldItalic.ttf
usr/share/fonts/truetype/freefont/FreeSans.ttf usr/share/mythtv/fonts/FreeSans.ttf
usr/share/fonts/truetype/freefont/FreeMono.ttf usr/share/mythtv/fonts/FreeMono.ttf
usr/share/fonts/truetype/freefont/FreeSansBold.ttf usr/share/mythtv/fonts/FreeSansBold.ttf
Expand Down
1 change: 0 additions & 1 deletion deb/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ override_dh_install:
cp debian/20-mythweb.ini ${buildroot}/etc/php/7.0/apache2/conf.d; \
dh_install -Xusr/share/mythtv/fonts/Free \
-Xusr/share/mythtv/fonts/Purisa \
-Xusr/share/mythtv/fonts/Droid \
-Xusr/share/mythtv/fonts/texgyrechorus \
-Xusr/lib/libmythzmq.la \
-Xusr/share/mythtv/fonts/tiresias_gpl3.txt \
Expand Down

0 comments on commit 7dbe026

Please sign in to comment.