Hi, Quoting Otto Kekäläinen (2024-11-23 00:09:41) > You can have upstream git and tarballs at the same time, and even have DFSG > cleanup take place and git show you exactly the differences of all the > versions.
I'm interested in the DFSG cleanup. How can this be done while having an upstream git repo that ships these files? Your example of src:entr does not seem to have any Files-Excluded. > If you look at > https://salsa.debian.org/debian/entr/-/network/debian%2Flatest?extended_sha1=debian%2Flatest&filter_ref=1 > (or better, gbp clone it locally to more easily browse it with `gitk --all`) > you can see how the upstream release git tag "5.6" was merged on branch > 'upstream/latest' which is the target of tarball imports, and that was then > merged on the 'debian/latest' branch. Commands how to do this are in > https://salsa.debian.org/debian/entr/-/blob/debian/latest/debian/README.source.md This is a really good write-up. Can we have this in a more prominent place than in a README.source of some "random" package? > and the > https://salsa.debian.org/debian/entr/-/blob/debian/latest/debian/gbp.conf has > the configs so git-buildpackage can be used without the need to constantly > pass it information about upstream git tag format etc. That gbp.conf touches 15 settings. Can gbp not do the right thing by default? > For dfsg-filtering the watchfile options only apply for uscan/tarball. To > ensure the upstream/latest branch stays dfsg-clean on git merges, configure > 'filter' in debian/gbp.conf. You mean in [import-orig]? Will this need to duplicate the entries that already exist in Files-Excluded? > Which package do you have DFSG tarballs? I can take a look and help you > convert it into something where the import is as automatic as possible. The import is automatic. I just run "uscan --verbose" and then "gbp import orig" and uscan will take care of using Files-Excluded to clean up the tarball. Thanks! cheers, josch
signature.asc
Description: signature
