ttf-dejavu: really ship aliases file

diff --git a/packages/ttf-fonts/ttf-dejavu/.mtn2git_empty b/packages/ttf-fonts/ttf-dejavu/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf b/packages/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf
new file mode 100644 (file)
index 0000000..9c6e56b
--- /dev/null
+++ b/packages/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+       <alias>
+               <family>DejaVu Serif</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>DejaVu Sans</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>DejaVu Sans Mono</family>
+               <default><family>monospace</family></default>
+       </alias>
+</fontconfig>

diff --git a/packages/ttf-fonts/ttf-dejavu_2.18.bb b/packages/ttf-fonts/ttf-dejavu_2.18.bb
index e0bd4af..17339e8 100644 (file)
--- a/packages/ttf-fonts/ttf-dejavu_2.18.bb
+++ b/packages/ttf-fonts/ttf-dejavu_2.18.bb
@@ -3,9 +3,10 @@ LICENSE = "Bitstream Vera"
 HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page"
 RDEPENDS = "ttf-dejavu-common"
 RDEPENDS_ttf-dejavu-common = ""
+PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2"
-#           file://30-dejavu-aliases.conf"
+SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2 \
+           file://30-dejavu-aliases.conf"
 
 require ttf.inc
 
@@ -13,7 +14,7 @@ S = "${WORKDIR}/dejavu-ttf-${PV}"
 
 do_install_append () { 
        install -d ${D}${sysconfdir}/fonts/conf.d/
-#      install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
+       install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
 }
 
 PACKAGES = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \