From 78f83e17d29cea59d10794412006f71bbcf2838b Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Tue, 3 Mar 2015 13:25:53 -0500
Subject: [PATCH] Keep 05-osx-fonts.conf in fonts dir to make the fonts work in
 development mode

---
 {fonts-osx/conf.d => fonts}/05-osx-fonts.conf | 0
 scripts/release-common.sh                     | 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename {fonts-osx/conf.d => fonts}/05-osx-fonts.conf (100%)

diff --git a/fonts-osx/conf.d/05-osx-fonts.conf b/fonts/05-osx-fonts.conf
similarity index 100%
rename from fonts-osx/conf.d/05-osx-fonts.conf
rename to fonts/05-osx-fonts.conf
diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index 2c98a625..cb96a9c1 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -361,9 +361,11 @@ fi
 if [ -n $FONTDIR ]; then
   echo $FONTDIR
   mkdir -p $FONTDIR
-  cp -a fonts/* $FONTDIR
+  cp -a fonts/10-liberation.conf $FONTDIR
+  cp -a fonts/Liberation-2.00.1 $FONTDIR
   case $OS in
     MACOSX) 
+      cp -a fonts/05-osx-fonts.conf $FONTDIR
       cp -a fonts-osx/* $FONTDIR
       ;;
     UNIX_CROSS_WIN)