[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 9f8c80261ab038816da9eefe2ed13034a4374404
Author: Jérémy Lal <kapouer at melix.org>
Date:   Thu Aug 25 12:12:29 2011 +0200

    Build and install FreeSans and DejaVuSans font files.
    
    debian/rules build clean install are affected.
    debian/control declares dependencies on ttf2ufm, php, and ttf fonts.
    Also remove unused .noencode file from archive, and fix permissions.

diff --git a/debian/control b/debian/control
index e4bd190..2029e6f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Jérémy Lal <kapouer at melix.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), cdbs
+Build-Depends: debhelper (>= 7), cdbs, ttf2ufm, ttf-dejavu, ttf-freefont, php5-cli
 Build-Depends-Indep: po-debconf
 Standards-Version: 3.9.2
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/redmine.git
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 5da5148..eab708b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -15,4 +15,4 @@ filter-pristine-tar = True
 # Since redmine version 1.2, filter out vendor/plugins/rfpdf/lib/fonts except makefontuni_ruby.php because it's not DFSG
 # and instead generate needed font files when building package, using ttf2ufm and that php script.
 # Between version 1.2.1 and 1.2.2, filter out vendor/plugins/rfpdf/lib/barcode because it will be removed anyway
-filter = ['*.bak', '*~', 'vendor/plugins/rfpdf/lib/barcode', 'vendor/plugins/rfpdf/lib/fonts/dejavu-ttf-2.15', 'vendor/plugins/rfpdf/lib/fonts/ttf-bitstream-vera-1.10', 'vendor/plugins/rfpdf/lib/fonts/freefont', 'vendor/plugins/rfpdf/lib/fonts/old', 'vendor/plugins/rfpdf/lib/fonts/*.z', 'vendor/plugins/rfpdf/lib/fonts/*.rb', 'vendor/plugins/rfpdf/lib/fonts/ttf2ufm/ttf2ufm*']
+filter = ['*.bak', '*~', 'vendor/plugins/rfpdf/lib/barcode', 'vendor/plugins/rfpdf/lib/fonts/dejavu-ttf-2.15', 'vendor/plugins/rfpdf/lib/fonts/ttf-bitstream-vera-1.10', 'vendor/plugins/rfpdf/lib/fonts/freefont', 'vendor/plugins/rfpdf/lib/fonts/old', 'vendor/plugins/rfpdf/lib/fonts/*.z', 'vendor/plugins/rfpdf/lib/fonts/*.rb', 'vendor/plugins/rfpdf/lib/fonts/ttf2ufm/ttf2ufm*', 'vendor/plugins/rfpdf/lib/fonts/.noencode']
diff --git a/debian/install b/debian/install
index 043de3f..c4e16be 100644
--- a/debian/install
+++ b/debian/install
@@ -18,3 +18,5 @@ vendor/plugins/prepend_engine_views usr/share/redmine/vendor/plugins
 vendor/plugins/rfpdf usr/share/redmine/vendor/plugins
 vendor/gems/rubytree-0.5.2 usr/share/redmine/vendor/gems
 debian/conf/*.template usr/share/redmine/templates
+buildfonts/*.z usr/share/redmine/vendor/plugins/rfpdf/lib/fonts
+buildfonts/*.rb usr/share/redmine/vendor/plugins/rfpdf/lib/fonts
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 6ae8341..f7fda52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
+buildfontsdir = buildfonts
+makefontunibin = cd $(buildfontsdir) && /usr/bin/php $(CURDIR)/vendor/plugins/rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php
+
 binary-install/redmine::
 	# Clean up the "extra" license files with typos :)
 	find debian/redmine/usr/share/redmine -name COPYING -exec rm -f '{}' \;
@@ -45,6 +48,40 @@ binary-install/redmine::
 	chmod a-x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/utf8test.txt
 	chmod a-x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/tcpdf.rb
 	chmod a-x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/config/lang/eng.rb
+	chmod a-x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php
+	chmod a-x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/fonts/ttf2ufm/README.TXT
 
 	# Replace shebang by /usr/bin/ruby1.8
 	sed -i -e 's/\#\!\/usr\/bin\/env\ ruby/\#\!\/usr\/bin\/ruby1\.8/g' `fgrep -Rl '#!/usr/bin/env ruby' debian/redmine/usr/share/redmine/*`
+
+	# install font files
+	mv $(buildfontsdir)/*.z debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/fonts/
+	mv $(buildfontsdir)/*.rb debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/fonts/
+
+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	
+
+clean::
+	rm -rf $(buildfontsdir)

-- 
redmine.git