[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 0b644259c3b3189b7d44aff097952b2d8d6583c8
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue Aug 23 14:44:06 2011 +0200

    Filter out vendor/plugins/rfpdf/lib/fonts, vendor/plugins/rfpdf/lib/barcode.
    
    First one is because that dir is not DFSG.
    Second one is because it's unused and removed in redmine 1.2.2 (and i have
    no clue what the copyright would be anyway).

diff --git a/debian/gbp.conf b/debian/gbp.conf
index dbae797..395afb9 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -11,7 +11,7 @@ debian-branch = master-experimental
 
 [git-import-orig]
 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*']
+# 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
+# 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']

-- 
redmine.git