Johannes Schauer Marin Rodrigues <jo...@debian.org> writes: > Quoting Simon Josefsson (2024-11-22 12:18:36) >> > I like to read of other people's workflows but then I often do not see how >> > their workflows can possibly fit my packages. There seem to be many people >> > who have the upstream git as part of their packaging git. I'm happy that >> > works for them but I don't see how I can leave my tarball-centered >> > workflows (even though all my upstream work in git) if all my upstreams >> > ship DFSG non-free material which I have to remove from their tarballs >> > first. >> This works fairly well these days: use Files-Excluded: in d/copyright and >> "dversionmangle=s/\+ds\d*$//,repacksuffix=+ds" in d/watch. Tools like gbp, >> uscan, origtargz seems to do the right thing automatically. > > That's what I'm doing. But that works with tarballs not with upstream > as git. If upstream (deliberately, so this will not change) has > DSFG-non-free content in it, then I should not copy that into a git > packaging repo that is targeting main. Removing the problematic parts > from the upstream git repos would rewrite their history, invalidate > tags etc, so the result would not be very useful anymore. Thus, I > usually have one directory on my PC with the upstream git and another > with my Debian packaging git. The packaging git does not have the > upstream git with non-free content int it. Instead my packaging git > regularly imports new upstream releases as tarballs and removes the > non-free content via Files-Excluded and dversionmangle/repacksuffix in > d/watch. I don't see how I can get rid of the tarballs here but > instead embrace the (non-free) upstream git. Maybe I'm missing > something?
Doesn't 'gbp import-orig --uscan' work if you have a watch-file like
this:
version=4
opts="mode=git, pgpmode=none,\
dversionmangle=s/\+ds\d*$//,repacksuffix=+ds" \
https://github.com/withfig/autocomplete-tools.git \
HEAD debian
Also is there a problem to mirror upstream's non-DFSG content on Salsa?
The important aspect seems to be that *.orig.tar.* and debian/* uploaded
into the archive shouldn't contain non-DFSG stuff if it targets main. I
thought Salsa can be used to maintain contrib/non-free/non-free-firmware
projects too, so I assume there is no restriction that Salsa git
repositories may only contain DFSG-content.
/Simon
signature.asc
Description: PGP signature
