Re: Git branch layout for packages requiring DFSG-cleaning

Dnia Fri, Aug 21, 2026 at 12:31:20AM +0300, Otto Kekäläinen napisał(a):
> Hi,
> 
> Which package are you working on?

https://tracker.debian.org/pkg/bambam

> 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.

Andreas kindly uploaded the packaging repo to salsa and converted to
DEP14, so I'd like to do things more by the book from now on...

> In pretty much all cases, I would have debian/latest represent the
> upstream version used to generate the upstream tarball.tar.gz that was
> uploaded to Debian, regardless of whether it is repacked or not. The
> parent commit of the upstream/latest might contain the real unmodified
> upstream git contents and that diff will show the differences to
> upstream regardless of whether repackaging or upstream tarball and git
> differences at play. The Debian gbp git repo layout is already
> slightly over-engineered, and thus I recommend against adding more
> branches.
> 
> However, whatever you decided to do, remember to have a
> debian/gbp.conf that documents the layout correctly so other
> maintainers can just run `gbp import-orig --uscan` and it will result
> in the same behavior as what you wanted to be done.

Hm, I guess there is no way to make this look for a latest upstream tag
rather than a tarball?

regards,
Marcin