Hello Go Team, I am asking this here because it seems to be Go Team policy with dh-make-golang to have it track the upstream Git repository as opposed to just importing released tarballs from upstream. Is there a recommended workflow for handling when files should be removed from the orig tarball that is uploaded to the Debian archive? https://salsa.debian.org/penguin359/pwru The package I am working on has both an embedded copy of the libpcap library in it's repo as well as a number of Go modules in it's /vendor/ folder. All of these dependencies are already in Debian and I have modified the build with patches to use the external packages for them. I then added a commit to the upstream branch that deletes the libpcap and vendor folder from the repo so they don't get included on the orig tarball that git-buildpackage generates. This was to keep the copyright file simple and avoiding duplication in the packages sitting in the Debian archive. The package builds and is fully functional with this, but it does mean that the upstream branch doesn't 100% track with the real upstream. For future releases, it shouldn't be too hard to find a solution to keep those folders out, but I am outside the normal workflow at this point. I'd need to either merge in the branch with -Xours and then delete any new files that appear, or just simple create a new commit onto whatever upstream commit I use as a base and a git rm to drop those in the future. The latter solution means that upstream branch won't fast forward unless I do something like merge in the previous upstream branch point with -s ours. Is there a better approach that is recommended here? When working with regular tarballs, as I recall, uscan would be able to use the Files-Excluded clause of debian/copyright and regenerate the tarball as needed, but I'm not sure what the best approach is if working directly with upstream in Git. -- Loren M. Lang lorenl@north-winds.org http://www.north-winds.org/ IRC: penguin359 Public Key: http://www.north-winds.org/lorenl_pubkey.asc Fingerprint: 7896 E099 9FC7 9F6C E0ED E103 222D F356 A57A 98FA
Attachment:
signature.asc
Description: PGP signature