# HG changeset patch
# User Sascha L. Teichmann <teichmann@intevation.de>
# Date 1352886795 -3600
# Node ID 439913782777b165a35ccb6ea460de79c6e64fd1
# Parent  302f5da348bb9c36f2bac555b058b3bf7f1adff0# Parent  82cc03e5f1c43de8cd8c64e3cc9724efc59948a0
Merged

diff -r 82cc03e5f1c4 -r 439913782777 contrib/make_flys_release/confs/mapserver/fontset.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/make_flys_release/confs/mapserver/fontset.txt	Wed Nov 14 10:53:15 2012 +0100
@@ -0,0 +1,2 @@
+FreeSans /usr/share/splashy/themes/default/FreeSans.ttf
+DefaultFont /usr/share/splashy/themes/default/FreeSans.ttf
diff -r 82cc03e5f1c4 -r 439913782777 contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Wed Nov 14 10:37:51 2012 +0100
+++ b/contrib/make_flys_release/make_release.sh	Wed Nov 14 10:53:15 2012 +0100
@@ -111,6 +111,7 @@
 cp confs/backend-db.xml $DIRECTORY/server/conf/backend-db.xml
 cp confs/artifact-db.xml $DIRECTORY/server/conf/artifact-db.xml
 cp confs/datacage-db.xml $DIRECTORY/server/conf/datacage-db.xml
+cp confs/mapserver/fontset.txt $DIRECTORY/server/conf/mapserver/fontset.txt
 
 cp $ARTIFACTS_HG/artifact-database/doc/schema-h2.sql h2/artifacts-h2.sql
 cp $FLYS_HG/flys-artifacts/doc/conf/datacage.sql h2/datacage.sql