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

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit 7a1e283cc4dc5a9b82ef836af0b2ba251ec677c8
Author: Jérémy Lal <kapouer at melix.org>
Date:   Fri Aug 26 14:58:54 2011 +0200

    Use simpler and working naming scheme for generated fonts.

diff --git a/debian/rules b/debian/rules
index f7fda52..d09c7ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,28 +60,22 @@ 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)/DejaVuSans-Bold
-	ttf2ufm -W 0 -a -F /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf $(buildfontsdir)/DejaVuSans-Oblique
-	ttf2ufm -W 0 -a -F /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf $(buildfontsdir)/DejaVuSans-BoldOblique
-	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)/FreeSansBold
-	ttf2ufm -W 0 -a -F /usr/share/fonts/truetype/freefont/FreeSansOblique.ttf $(buildfontsdir)/FreeSansOblique
-	ttf2ufm -W 0 -a -F /usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf $(buildfontsdir)/FreeSansBoldOblique
-	$(makefontunibin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf DejaVuSans.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf DejaVuSans-Bold.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf DejaVuSans-Oblique.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf DejaVuSans-BoldOblique.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/freefont/FreeSans.ttf FreeSans.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/freefont/FreeSansBold.ttf FreeSansBold.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/freefont/FreeSansOblique.ttf FreeSansOblique.ufm
-	$(makefontunibin) /usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf FreeSansBoldOblique.ufm
-	cd $(buildfontsdir) && mv dejavusans-bold.rb dejavusansb.rb
-	cd $(buildfontsdir) && mv dejavusans-oblique.rb dejavusansi.rb
-	cd $(buildfontsdir) && mv dejavusans-boldoblique.rb dejavusansbi.rb
-	cd $(buildfontsdir) && mv freesansbold.rb freesansb.rb
-	cd $(buildfontsdir) && mv freesansoblique.rb freesansi.rb
-	cd $(buildfontsdir) && mv freesansboldoblique.rb freesansbi.rb	
+	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
+	$(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
+	$(makefontunibin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf dejavusansbi.ufm
+	$(makefontunibin) /usr/share/fonts/truetype/freefont/FreeSans.ttf freesans.ufm
+	$(makefontunibin) /usr/share/fonts/truetype/freefont/FreeSansBold.ttf freesansb.ufm
+	$(makefontunibin) /usr/share/fonts/truetype/freefont/FreeSansOblique.ttf freesansi.ufm
+	$(makefontunibin) /usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf freesansbi.ufm
 
 clean::
 	rm -rf $(buildfontsdir)

-- 
redmine.git