[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.1.3-1-75-gd155f08

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit d155f08f298d25df1bc024292e7a54ab81bb30a3
Author: Jérémy Lal <kapouer at melix.org>
Date:   Fri Aug 26 16:15:55 2011 +0200

    ttf2ufm segfaults when LANG=C with FreeSansBold.ttf. Give some other LANG.

diff --git a/debian/rules b/debian/rules
index d09c7ba..3e86696 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 buildfontsdir = buildfonts
+ttf2ufmbin = LANG=en_EN.utf8 ttf2ufm -W 0 -a -F
 makefontunibin = cd $(buildfontsdir) && /usr/bin/php $(CURDIR)/vendor/plugins/rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php
 
 binary-install/redmine::
@@ -60,14 +61,14 @@ binary-install/redmine::
 
 build:
 	mkdir -p $(buildfontsdir)
-	ttf2ufm -W 0 -a -F /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf $(buildfontsdir)/dejavusans
-	ttf2ufm -W 0 -a -F /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf $(buildfontsdir)/dejavusansb
-	ttf2ufm -W 0 -a -F /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf $(buildfontsdir)/dejavusansi
-	ttf2ufm -W 0 -a -F /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf $(buildfontsdir)/dejavusansbi
-	ttf2ufm -W 0 -a -F /usr/share/fonts/truetype/freefont/FreeSans.ttf $(buildfontsdir)/freesans
-	ttf2ufm -W 0 -a -F /usr/share/fonts/truetype/freefont/FreeSansBold.ttf $(buildfontsdir)/freesansb
-	ttf2ufm -W 0 -a -F /usr/share/fonts/truetype/freefont/FreeSansOblique.ttf $(buildfontsdir)/freesansi
-	ttf2ufm -W 0 -a -F /usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf $(buildfontsdir)/freesansbi
+	$(ttf2ufmbin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf $(buildfontsdir)/dejavusans
+	$(ttf2ufmbin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf $(buildfontsdir)/dejavusansb
+	$(ttf2ufmbin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf $(buildfontsdir)/dejavusansi
+	$(ttf2ufmbin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf $(buildfontsdir)/dejavusansbi
+	$(ttf2ufmbin) /usr/share/fonts/truetype/freefont/FreeSans.ttf $(buildfontsdir)/freesans
+	$(ttf2ufmbin) /usr/share/fonts/truetype/freefont/FreeSansBold.ttf $(buildfontsdir)/freesansb
+	$(ttf2ufmbin) /usr/share/fonts/truetype/freefont/FreeSansOblique.ttf $(buildfontsdir)/freesansi
+	$(ttf2ufmbin) /usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf $(buildfontsdir)/freesansbi
 	$(makefontunibin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf dejavusans.ufm
 	$(makefontunibin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf dejavusansb.ufm
 	$(makefontunibin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf dejavusansi.ufm

-- 
redmine.git