[minetest-v04x] 04/07: Replace DroidSansFallback.ttf with Debian's system font and use

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository minetest-v04x.

commit 8d94f69237e37259645dfcdf61975d583b9b7abc
Author: Markus Koschany <apo at debian.org>
Date:   Wed Dec 21 23:07:56 2016 +0100

    Replace DroidSansFallback.ttf with Debian's system font and use
    
    minetest-data.links instead of debian/rules for this.
---
 debian/minetest-data.links | 3 +++
 debian/rules               | 9 ---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/minetest-data.links b/debian/minetest-data.links
new file mode 100644
index 0000000..26f871f
--- /dev/null
+++ b/debian/minetest-data.links
@@ -0,0 +1,3 @@
+usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf usr/share/games/minetest/fonts/liberationmono.ttf
+usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf usr/share/games/minetest/fonts/liberationsans.ttf
+usr/share/fonts-droid-fallback/truetype/DroidSansFallback.ttf usr/share/games/minetest/fonts/DroidSansFallbackFull.ttf
diff --git a/debian/rules b/debian/rules
index 4daed1b..a42cce5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,15 +71,6 @@ override_dh_install:
 	convert debian/minetest/usr/share/icons/hicolor/24x24/apps/minetest-icon.png \
 		debian/minetest/usr/share/pixmaps/minetest.xpm
 
-	# Don't include ttf files, but links to the system ones
-	mkdir -p debian/minetest-data/usr/share/games/minetest/fonts # Not sure why/when they exist or not
-	rm -f debian/minetest-data/usr/share/games/minetest/fonts/liberationmono.ttf
-	ln -s /usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf \
-	      debian/minetest-data/usr/share/games/minetest/fonts/liberationmono.ttf
-	rm -f debian/minetest-data/usr/share/games/minetest/fonts/liberationsans.ttf
-	ln -s /usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf \
-	      debian/minetest-data/usr/share/games/minetest/fonts/liberationsans.ttf
-
 	# Install the mapper script
 	mkdir -p debian/minetest-data/usr/games
 	cp util/minetestmapper.py debian/minetest-data/usr/games/minetest-mapper

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/minetest-v04x.git