On Mon, Apr 17, 2017 at 11:25:21AM +0200, Guido Günther wrote: > Full filter expression from gbp.conf please.
The relevant part of debian/gbp.conf: > [import-orig] > # filter out unwanted files/dirs from upstream > filter = [ '.bzrignore', '*.gitignore', '.gitattributes', '.travis.yml', ] > # filter the files out of the tarball passed to pristine-tar > filter-pristine-tar = True ... > Full log (as suggested by reportbug) would have been nice. This would > have shown that we never try to repack the component tarballs: > > > https://github.com/agx/git-buildpackage/blob/master/gbp/scripts/import_orig.py#L577 > > Just in case somebody wants to spin a patch. This is the full log of the import: > $ TMPDIR=/var/tmp gbp import-orig --verbose > ../../gitprojects/kicad_4.0.6+dfsg1.orig.tar.xz > gbp:debug: ['git', 'rev-parse', '--show-cdup'] > gbp:debug: ['git', 'rev-parse', '--is-bare-repository'] > gbp:debug: ['git', 'rev-parse', '--git-dir'] > gbp:debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/'] > gbp:debug: ['git', 'show-ref', 'refs/heads/upstream'] > gbp:debug: ['git', 'status', '--porcelain'] > What is the upstream version? [4.0.6+dfsg1] > gbp:debug: ['git', 'tag', '-l', 'upstream/4.0.6+dfsg1'] > gbp:debug: tar ['--exclude=.bzrignore', '--exclude=*.gitignore', > '--exclude=.gitattributes', '--exclude=.travis.yml', '-C', '../tmpQAFA8_', > '-a', '-xf', '../../gitprojects/kicad_4.0.6+dfsg1.orig.tar.xz'] [] > gbp:debug: Unpacked '../../gitprojects/kicad_4.0.6+dfsg1.orig.tar.xz' to > '../tmpQAFA8_' > gbp:debug: Filter pristine-tar: repacking > '../../gitprojects/kicad_4.0.6+dfsg1.orig.tar.xz' from '../tmpQAFA8_' > gbp:debug: tar ['--exclude=.bzrignore', '--exclude=*.gitignore', > '--exclude=.gitattributes', '--exclude=.travis.yml', '-C', '..', '-a', '-cf', > '../../gitprojects/kicad_4.0.6+dfsg1.orig.gbp.tar.xz', 'tmpQAFA8_'] [] > gbp:debug: tar ['--exclude=.bzrignore', '--exclude=*.gitignore', > '--exclude=.gitattributes', '--exclude=.travis.yml', '-C', > '/media/carsten/d7a472be-9d4a-4f61-bd2f-eee64d2886be/kicad-packaging2/tmpl62EXO', > '-a', '-xf', '../../gitprojects/kicad_4.0.6+dfsg1.orig-doc.tar.xz'] [] > gbp:debug: rm ['-rf', > '/media/carsten/d7a472be-9d4a-4f61-bd2f-eee64d2886be/kicad-packaging2/tmpl62EXO'] > [] > gbp:debug: tar ['--exclude=.bzrignore', '--exclude=*.gitignore', > '--exclude=.gitattributes', '--exclude=.travis.yml', '-C', > '/media/carsten/d7a472be-9d4a-4f61-bd2f-eee64d2886be/kicad-packaging2/tmpgbgvju', > '-a', '-xf', '../../gitprojects/kicad_4.0.6+dfsg1.orig-i18n.tar.xz'] [] > gbp:debug: rm ['-rf', > '/media/carsten/d7a472be-9d4a-4f61-bd2f-eee64d2886be/kicad-packaging2/tmpgbgvju'] > [] > gbp:debug: tar ['--exclude=.bzrignore', '--exclude=*.gitignore', > '--exclude=.gitattributes', '--exclude=.travis.yml', '-C', > '/media/carsten/d7a472be-9d4a-4f61-bd2f-eee64d2886be/kicad-packaging2/tmpM4BoeK', > '-a', '-xf', '../../gitprojects/kicad_4.0.6+dfsg1.orig-libraries.tar.xz'] [] > gbp:debug: rm ['-rf', > '/media/carsten/d7a472be-9d4a-4f61-bd2f-eee64d2886be/kicad-packaging2/tmpM4BoeK'] > [] > gbp:info: Importing '../../gitprojects/kicad_4.0.6+dfsg1.orig.gbp.tar.xz' to > branch 'upstream' (filtering out ['.bzrignore', '*.gitignore', > '.gitattributes', '.travis.yml'])... > gbp:info: Source package is kicad > gbp:info: Upstream version is 4.0.6+dfsg1 > gbp:debug: ['git', 'show-ref', 'refs/heads/upstream'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream'] > gbp:debug: ['git', 'add', '-f', '.'] > gbp:debug: ['git', 'write-tree'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream'] > gbp:debug: ['git', 'commit-tree', 'e0f8b3476af0926f717efd533607b4a1de647e65', > '-p', 'b72052dd913d9b3a090a2c661feaf2652a4f478a'] > gbp:debug: ['git', 'update-ref', '-m', 'gbp: New upstream version > 4.0.6+dfsg1', 'refs/heads/upstream', > '3f9faedd130a8dadfc9361a46d16b02fdfcbf95e', > 'b72052dd913d9b3a090a2c661feaf2652a4f478a'] > gbp:debug: ['git', 'show-ref', 'refs/heads/pristine-tar'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'pristine-tar'] > gbp:debug: ['git', 'ls-tree', '-z', 'upstream', '--'] > gbp:debug: ['git', 'mktree', '-z'] > gbp:debug: ['git', 'ls-tree', '-z', 'upstream', '--'] > gbp:debug: Creating pristine tar commit 'doc' from > '38e620a8950a93ce86499dd621a43fde28ee1374' > gbp:debug: /usr/bin/pristine-tar [] ['commit', > '../../gitprojects/kicad_4.0.6+dfsg1.orig-doc.tar.xz', > '38e620a8950a93ce86499dd621a43fde28ee1374'] > gbp:debug: ['git', 'ls-tree', '-z', 'upstream', '--'] > gbp:debug: Creating pristine tar commit 'i18n' from > 'f0b5fa8310a152f7420aff3dacfc154e47542008' > gbp:debug: /usr/bin/pristine-tar [] ['commit', > '../../gitprojects/kicad_4.0.6+dfsg1.orig-i18n.tar.xz', > 'f0b5fa8310a152f7420aff3dacfc154e47542008'] > gbp:debug: ['git', 'ls-tree', '-z', 'upstream', '--'] > gbp:debug: Creating pristine tar commit 'libraries' from > 'd6f158a258e824cad2ae251683c080142fb7c014' > gbp:debug: /usr/bin/pristine-tar [] ['commit', > '../../gitprojects/kicad_4.0.6+dfsg1.orig-libraries.tar.xz', > 'd6f158a258e824cad2ae251683c080142fb7c014'] > gbp:debug: /usr/bin/pristine-tar [] ['commit', > '../kicad_4.0.6+dfsg1.orig.tar.xz', > '6d02b04a528d2c304dc38cda695ea405e75b4f79'] > gbp:debug: ['git', 'tag', '-m', 'Upstream version 4.0.6+dfsg1', > 'upstream/4.0.6+dfsg1', '3f9faedd130a8dadfc9361a46d16b02fdfcbf95e'] > gbp:debug: ['git', 'show-ref', 'refs/heads/debian/sid'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'debian/sid'] > gbp:info: Merging to 'debian/sid' > gbp:debug: ['git', 'symbolic-ref', 'HEAD'] > gbp:debug: ['git', 'show-ref', 'refs/heads/debian/sid'] > gbp:debug: ['git', 'symbolic-ref', 'HEAD'] > gbp:debug: ['git', 'show-ref', 'refs/heads/debian/sid'] > gbp:debug: ['git', 'help', 'merge', '-m'] > gbp:debug: ['git', 'merge', '--no-summary', '--no-edit', > 'upstream/4.0.6+dfsg1'] > gbp:debug: ['git', 'symbolic-ref', 'HEAD'] > gbp:debug: ['git', 'show-ref', 'refs/heads/debian/sid'] > gbp:debug: ['git', 'symbolic-ref', 'HEAD'] > gbp:debug: ['git', 'show-ref', 'refs/heads/debian/sid'] > gbp:debug: rm ['-rf', '../tmpQAFA8_'] [] > gbp:info: Successfully imported version 4.0.6+dfsg1 of > ../../gitprojects/kicad_4.0.6+dfsg1.orig.gbp.tar.xz Regards Carsten
