On Mon, Jan 8, 2018 at 3:04 PM, Raphael Hertzog <[email protected]> wrote:
> Hi, > > On Sat, 06 Jan 2018, Michael Stapelberg wrote: > > > > If yes, then I don’t particularly like the name “nondfsg/latest”, as > > > > it is a double-negative, but describes a very common case. Why not > > > > keep calling it “upstream”, or “upstream/latest” if symmetry is > > > > desired? > > > > > > Isn't that what we're using for the filtered sources. The longer I > think > > > about it I think that > > > > > > https://honk.sigxcpu.org/projects/git-buildpackage/ > > > manual-html/gbp.branch.naming.html > > > > > > fits better than DEP14. Maybe we should modify DEP14 to say that > > > upstream/ keeps the unfiltered source and dfsgclean/ the filtered one? > > > > Raphael, any thoughts? > > I think that if you want to change this, then we should discuss it on > debian-devel. > > If everything comes down to the fact that you don't find a good name, I'm > happy to throw a few suggestions: > What about "pristine-upstream" or "original-upstream" or "upstream.orig" > or "uptream.real" for the non-filtered upstream branch ? > None of these fit with DEP14, unless I’m misunderstanding the following paragraph? If the Git workflow in use imports the upstream sources from released tarballs, this should be done under the "upstream" namespace. By default, the latest upstream version should be imported in the upstream/latest branch and when packages for multiple upstream versions are maintained concurrently, one should create as many upstream branches as required. So, are you suggesting upstream/pristine? Thinking about it, my suggestions would be: • branch “upstream/latest” tracks an upstream branch, e.g. remote “upstream”, branch “master”. • branch “upstream/latest-filtered” contains a filtered version of that branch, whose commits would be tagged e.g. upstream/1.0+dfsg1 so that gbp-buildpackage picks the correct commit. I think that complies with DEP14 as good as possible, and is still reasonably clear for casual users. Thoughts? > > Cheers, > -- > Raphaël Hertzog ◈ Debian Developer > > Support Debian LTS: https://www.freexian.com/services/debian-lts.html > Learn to master Debian: https://debian-handbook.info/get/ > -- Best regards, Michael
