Hello, On Fri, Jul 06 2018, Martín Ferrari wrote:
> On 05/07/18 14:19, Guido Günther wrote:
>
>>> So IMHO, the upstream branch should only contain upstream commits.
>>> Then question comes to how we create the dfsg orig tarball.
>>
>> Just create a commit with the files filtered out and tag it
>> approriately (with the original commit as parent). gbp
>> export-orig/buildpackage will then be able to find it to create the
>> tarball.
>
> This is what I have been doing in my packages, and what has been
> agreed to become the standard for the go team. Using one branch for
> the pristine upstream history, and another one that keeps the
> repackaging differences. Gbp buildpackage works well with this
> workflow, as you only need to add the appropriate tags. The missing
> part will be the automation to update these branches, ideally using
> files-exluded as the source of truth.
This would be an application of what I requested in this bug to a
traditional gbp workflow, indeed. The reference to pristine-tar in the
title of this bug is a bit misleading, as it's not really about that.
Eventually, however, I would like to extend or wrap this functionality
to work with upstream tags, such that a branches tracking the unfiltered
and filtered upstream source are not needed.
The idea is that the upstream source is immutable from Debian's point of
view, and tags reflect and track that better than branches do.
The workflow would be something like this:
% git fetch upstream
% # some gbp command which takes the tag 1.2.3 and produces the filtered
% # tag 1.2.3+dfsg
% git merge 1.2.3+dfsg
% git deborig
--
Sean Whitton
signature.asc
Description: PGP signature
