On Mon, Apr 17, 2017 at 10:26:56AM +0200, Carsten Schoenert wrote: > Package: git-buildpackage > Version: 0.8.12.2 > Severity: normal > > While working on a new upstream version of kicad it's vissible that gbp > is (still) ignoring the filter-pristine-tar option for the commits of > the complementary tarballs into the pristine-tar branch.
Can't parse the "still" above. We never tied to fix this before. > > Some of the extra tarballs containing e.g some .gitattributes and > .tarvis.yml files in various subdirectories. > > ... > comp-folder/folder1/.gitattributes > folder2/.travis.yml > folder3/.gitattributes > ... Full filter expression from gbp.conf please. > > gbp is correctly cleaning this out and imports this content to the > upstream branch. There are no such files visible later. > > For the main tarball of the source a respective *.gbp.tar.xz is created > and commited to the pristine-tar branch afterwards. But all > complementary stuff isn't repacked into *-comp.gbp.tar.xz archives and > commited to the pristine-tar branch. > > ... > 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'] > ... 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. Cheers, -- Guido > > dpkg-source is notice the difference and shows: > ... > dpkg-source: warning: ignoring deletion of file > libraries/Housings_SON.pretty/.travis.yml, use --include-removal to override > dpkg-source: warning: ignoring deletion of file > libraries/Connectors_USB.pretty/.travis.yml, use --include-removal to override > dpkg-source: warning: ignoring deletion of file > libraries/Housings_CSP.pretty/.travis.yml, use --include-removal to override > dpkg-source: warning: ignoring deletion of file > libraries/Battery_Holders.pretty/.travis.yml, use --include-removal to > override > dpkg-source: warning: ignoring deletion of file doc/.travis.yml, use > --include-removal to override > ... > > So Lintian is later on showing messages like: > > ... > W: kicad-common: package-contains-vcs-control-file > usr/share/kicad/modules/Connectors_USB.pretty/.gitattributes > W: kicad-common: package-contains-vcs-control-file > usr/share/kicad/modules/Housings_SON.pretty/.gitattributes > ... > > Regards > Carsten > > -- System Information: > Debian Release: 9.0 > APT prefers testing > APT policy: (500, 'testing') > Architecture: amd64 (x86_64) > Foreign Architectures: armhf > > Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores) > Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8) > Shell: /bin/sh linked to /bin/dash > Init: systemd (via /run/systemd/system) > > Versions of packages git-buildpackage depends on: > ii devscripts 2.17.5 > ii git 1:2.11.0-2 > ii man-db 2.7.6.1-2 > ii python-dateutil 2.5.3-2 > ii python-pkg-resources 33.1.1-1 > ii python-six 1.10.0-3 > pn python:any <none> > > Versions of packages git-buildpackage recommends: > ii cowbuilder 0.85 > ii pbuilder 0.228.6 > ii pristine-tar 1.38 > ii python-requests 2.12.4-1 > > Versions of packages git-buildpackage suggests: > pn python-notify <none> > ii sudo 1.8.19p1-1 > ii unzip 6.0-21 > > -- no debconf information >
