Hi! > > I am contemplating if I should also make videos on Debian packaging best > > practices, or have start a new Matrix channel specifically to help > > maintainers setup their git repositories correctly and find the optimal > > git-buildpackage commands for each thing they want to do. > > I'd describe myself of being in the camp of "I don't care about the commands, i > don't care how my git branches are named, just document one thing so that my > packages can do the same thing that most other packages do". For that reason I > so far created new package repos with "gbp import-dsc" and used all the > defaults that come with that. I don't think I care much for what these defaults > are at least I didn't see myself reading past discussions about this and > thinking "nooooo don't name this branch debian/latest instead of debian/foo" or > something. 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.
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. 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 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. 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. 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.
