Hi Marc and others, ... > >How would I: > >- convert such a package to have the upstream git history in salsa's > >main branch > >- still be able to do an upload with upstream's signed origtargz > >- probably even have upstream git history in git log of debian/latest?
Thanks to Colin for the additional info. I'd like to stress that while Colin had these parameters given on the command-line for the sake of explaining how it works..: > Using "gbp import-orig --upstream-vcs-tag" [1] for the next new release .. > "gbp import-orig --pristine-tar --uscan --upstream-vcs-tag=whatever". ..to will get the dual tar+git import and all of above by simply always running 'git import-orig --uscan' and having in gbp.conf these defined: upstream-vcs-tag = %(version%~%.)s pristine-tar = True The format of 'upstream-vcs-tag' needs to be adjusted to match your upstream's convention. Perhaps trying out a demo described in https://lists.debian.org/debian-devel/2026/01/msg00231.html can help you visually see what exactly is happening in the repo. First run this to prepare: cd $(mktemp -d) gbp clone --add-upstream-vcs https://salsa.debian.org/otto/galera-4-demo.git cd galera-4-demo/ Then open gitk to see visually the git repo history with all branches: gitk --all & Then run the import: gbp import-orig --uscan --verbose Then go back to the gitk window and press F5 to have it reload and show the state of the import. You will see how the gbp.conf:upstream-vcs-tag automatically applied and took the upstream git history even though you simply just ran 'gbp import-orig --uscan'. To your question on how to migrate to this setup, I believe all you need to do is configure gbp.conf correctly once, and thereafter 'gbp import-orig --uscan' will do everything automatically (with the caveat that your starting point was a fairly "normal" Debian packaging git).
