[SCM] xbmc/master: Fall back to old location of DejaVuSans.ttf if needed
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Thu Jun 12 12:21:27 UTC 2014
The following commit has been merged in the master branch:
commit b7983ea250693ad1977f2ea964b7d9b86b5589a7
Author: Balint Reczey <balint at balintreczey.hu>
Date: Mon Jun 9 17:58:27 2014 +0700
Fall back to old location of DejaVuSans.ttf if needed
This helps backporting.
diff --git a/debian/rules b/debian/rules
index c5d98ef..04e4763 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,6 +102,13 @@ override_dh_clean:
# Use package's version in XBMC
VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: \(.*\)/\1/p')
+# fall back to old location of DejaVuSans.ttf if needed
+ifneq ("$(wildcard /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf)","")
+DEJAVUSANS=/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf
+else
+DEJAVUSANS=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
+endif
+
override_dh_auto_configure: configure
sed -i 's/DEB_VERSION/"'$(VERSION)'"/' xbmc/GUIInfoManager.cpp
rm -r addons/service.xbmc.versioncheck
@@ -110,7 +117,7 @@ override_dh_auto_configure: configure
-ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/VeraMono.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
fontforge -script $(CURDIR)/debian/mergefonts.ff \
/usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf \
- /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf \
+ $(DEJAVUSANS) \
$(CURDIR)/media/Fonts/arial.ttf
./bootstrap
./configure $(XBMC_CONFIG_OPTIONS)
--
xbmc packaging
More information about the pkg-multimedia-commits
mailing list