Re: Git branch layout for packages requiring DFSG-cleaning

Hi,

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

The above is the standard way to define files to exclude and will
automatically work with uscan and gbp and probably most other tools.

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

If not gbp, then what? If not with debian/copyright:Files-Exclude
lines, how did you select and remove the upstream files?

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

If you ask help on what are the best practices on how repack imports,
and turns out you are not using using `gbp import-orig --uscan` nor
uscan or other "standard tools" (in quotes as Debian famously does not
want to standardize on any packaging workflow/tools), giving advice on
how you should customize your custom workflow is a bit challenging.

If you do plan to start using `gbp import-orig --uscan` as the command
to do imports, you can look at other packages that already repack how
they are configured. For example
https://salsa.debian.org/games-team/godot/-/tree/debian/latest/debian
has an up-to-date debian/copyright with Files-Exclude and also the
watch file and gbp.conf are correct, and imports and repacks are fully
automatic on simply running `gbp import-orig --uscan`.