[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 52b82f1d952e764d99e97fe2e068324c7891dc91
Author: Jérémy Lal <kapouer at melix.org>
Date:   Thu Aug 25 11:10:08 2011 +0200

    vendor/plugins/rfpdf/lib/fonts : get rid of all but makefontuni_ruby.php.

diff --git a/debian/changelog b/debian/changelog
index 3c5ecae..2311210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-redmine (1.2.1+dfsg1-1) UNRELEASED; urgency=low
+redmine (1.2.1+dfsg2-1) UNRELEASED; urgency=low
 
   [TODO]
   * Use ttf2ufm to trigger generation of ruby fonts files, change fonts path
diff --git a/debian/copyright b/debian/copyright
index 7537f1b..81b19a4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -138,7 +138,7 @@ Files: vendor/plugins/open_id_authentication/*
 Copyright: 2007 David Heinemeier Hansson
 License: Expat
 
-Files: vendor/plugins/rfpdf/lib/rfpdf.rb vendor/plugins/rfpdf/lib/rfpdf/*
+Files: vendor/plugins/rfpdf/lib/rfpdf.rb vendor/plugins/rfpdf/lib/rfpdf/* vendor/plugins/rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php
 Copyright: 2006 4ssoM LLC <www.4ssoM.com>
 License: Expat
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 395afb9..5da5148 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -12,6 +12,7 @@ debian-branch = master-experimental
 [git-import-orig]
 filter-pristine-tar = True
 # filter out *.bak, *~ files upstream sometimes let through.
-# Since redmine version 1.2, filter out vendor/plugins/rfpdf/lib/fonts because it's not DFSG
+# 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']
+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*']

-- 
redmine.git