Re: RFS: Bug#957360: insighttoolkit4: ftbfs with GCC-10
Am Samstag, den 08.08.2020, 16:38 -0500 schrieb Steven Robbins:
> On Saturday, August 8, 2020 3:28:45 P.M. CDT Étienne Mollier wrote:
> >
> > Looking back to the upstream branch, if I understand correctly,
> > previous upstream/$vers-dfsg1 tags are pointing to a directory
> > with both source and data, which seems more consistent with
> > option 2, except the needed tag is in use with the source only
> > variant.
>
> Yes, I see that now. So I'm even more confused how come we have two
> orig tarballs for these releases (4.12.1 through 4.13.2). My guess
> is that Gert manually created the two tarballs.
Actually, "make -f debian/rules get-orig-source" did the right thing
here (This is broken now with ITK 5.0 because the download locations
can't be browsed, so uscan fails for the data file). Then there is some
command line option for gbp that imports both, the source and the data
tarball, into git. I've never tried to create a different, combined
tarball from that. I also didn't find a way to re-create the two
separate tarballs from the git repo.
> I used the gbp magic "create a tarball from git" for 4.13.2 and did
> indeed end up with one that combined source and data.
>
>
> > My impression is option 2 would be fine to resolve the
> > present situation; but I don't have much experience with
> > resolving conflicts with VCSs, so take it with a grain of salt.
> > Sorry about the rather shaky situation with the upgrade. :/
>
> No, I think you did the right thing. I actually like the tag
> "upstream/ 4.13.3-dfsg1+data" that you used. It provides a hint
> that it is not the bare upstream tarball.
>
> All we need to do is call the source "4.13.3-dfsg1+data-1" and then
> "gbp buildpackage" will create the source+data tarball.
+1
Using more than one tarball is really a nuisance, I as just not bold
enough to try to get only one.
Best,
Gert
Reply to: