Re: Git branch layout for packages requiring DFSG-cleaning

Hi,

On Mon Aug 24, 2026 at 6:38 AM CEST, Marcin Owsiany wrote:
> Dnia Fri, Aug 21, 2026 at 12:31:20AM +0300, Otto Kekäläinen napisał(a):
>> Do you use
>> debian/copyright:Files-Exclude lines to remove upstream files?
>
> No. I'm open to using them, but are they useful in a git-only workflow?
>
>> Do you
>> do the import with `gbp import-orig --uscan`?
>
> No. So far I only used gbp to do local builds, not to track upstream.
>
>> Is your debian/gbp.conf
>> configured to import upstream-vcs-tag
>
> No. I guess because I never used `gbp import-orig` for this package...
>
>> or are you otherwise tracking
>> upstream git?
>
> Yes. Until recently I had a rather ad-hoc setup:
>  - ignoring upstream tarballs,
>  - not using gbp for importing upstream sources,
>  - tracking upstream git as follows: branch `master+dfsg` had
>    DFSG-dubious files removed (compared to the upstream `master`). So
>    with each upstream version I did a manual merge of upstream tag into
>    this branch, before merging it into my packaging branch.

Your ad-hoc setup does not look that different from the one documented 
in the dgit-maint-merge(7) manual page. I'd recommend taking a look! It 
also documents how to handle DSFG-cleaning:

https://manpages.debian.org/testing/dgit-maint-merge.7#HANDLING_DFSG-NON-FREE_MATERIAL

Bye :)