On Saturday, August 8, 2020 3:28:45 P.M. CDT Étienne Mollier wrote: > Hi Steven, Hi Gert, > > Steven Robbins, on 2020-08-08 14:22:08 -0500: > > I've looked through all the changes now. I have some questions. > > > > Inline ITK data v4.13.3 > > 7c3eb773ef1a698af32360ecd020bab997aed584 > > > > It looks like you unpacked the data into data/ in the upstream branch. > > However, the upstream/4.13.3-dfsg1 tag is prior to this commit, so the > > orig.tar generation does NOT include the data. It seems to me that we > > should take one of two approaches: > > > > 1. Retain the upstream "source" and "data" tarballs, in which case the > > above commit should be reverted so as to keep the upstream branch > > consistent with the upstream "source-only" tarball. > > > > 2. Merge the data and source. But then the source would be named using > > the > > tag on the above commit (i.e. upstream/4.13.3-dfsg1+data) > > > > The first approach was used previously -- which is why there are two > > "orig" > > tarballs -- but the second has merit also in that we have only a single, > > bigger, tarball. Opinions welcome -- I'm ok with either approach. > > 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. 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. -Steve
Attachment:
signature.asc
Description: This is a digitally signed message part.