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

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit c787c074b720ac142b37162ac2344d6405020918
Author: Jérémy Lal <kapouer at melix.org>
Date:   Fri Aug 19 00:00:09 2011 +0200

    Let rfpdf, but remove unused fonts. Rfpdf is packageable after all, since ttf2ufm is now in debian.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index e0124be..dbae797 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -10,6 +10,8 @@ debian-branch = master-experimental
 
 
 [git-import-orig]
-# those files should not be in the tarball
-filter = ['*.bak','*~','vendor/plugins/rfpdf']
 filter-pristine-tar = True
+# those files should not be in the tarball (uncomment when next filter is removed)
+# filter = ['*.bak','*~']
+# those files will be removed in redmine 1.2.2
+filter = ['*.bak', '*~', 'vendor/plugins/rfpdf/lib/barcode', 'vendor/plugins/rfpdf/lib/fonts/sjis.rb', 'vendor/plugins/rfpdf/lib/fonts/zapfdingbats.rb', 'vendor/plugins/rfpdf/lib/fonts/symbol.rb', 'vendor/plugins/rfpdf/lib/fonts/courier.rb', 'vendor/plugins/rfpdf/lib/fonts/times*.rb', 'vendor/plugins/rfpdf/lib/fonts/vera*', 'vendor/plugins/rfpdf/lib/fonts/FreeMono*', 'vendor/plugins/rfpdf/lib/fonts/freemono*', 'vendor/plugins/rfpdf/lib/fonts/DejaVuSansCondensed*', 'vendor/plugins/rfpdf/lib/fonts/DejaVuSansMono*', 'vendor/plugins/rfpdf/lib/fonts/DejaVuSansbi.rb', 'vendor/plugins/rfpdf/lib/fonts/DejaVuSerif*', 'vendor/plugins/rfpdf/lib/fonts/DejaVuSans-ExtraLight*']

-- 
redmine.git