[git-buildpackage] Blog post review request: An explainer of the optimal git repository structure in 2025

[Guido Günther]

Hi,
On Mon, Jan 20, 2025 at 12:05:15AM -0800, Otto Kekäläinen wrote:
> > I'd like to piggy back a question for you to this mail. I just converted box64
> > to dep14 branch layout manually. You probably saw my responses to the salsa
> > devscripts MR of yours. To fix the problems, I deleted my local git clone and
> > created a new one with:
> >
> >     gbp clone --add-upstream-vcs https://salsa.debian.org/debian/box64.git
> >
> > Now everything works. So somehow my local git repo was borked. I tried
> > importing the new upstream release but got this:
> >
> >    gbp:error: Import of ../box64_0.3.2+dfsg.orig.tar.xz failed: Can't find upstream vcs tag at 'v0.3.2+dfsg'
> >
> > How do I tell gbp that my Debian version has a +dfsg suffix which has to be
> > stripped off when searching for the upstream tag?

We unmangle the Debian version (remove the +dfsg) automatically:

   https://salsa.debian.org/agx/git-buildpackage/-/blob/master/gbp/deb/git.py#L137

then call `version_to_tag` to get the upstream's vcs tag so make sure
your `vcs_tag_format` (which comes from `--upstream-vcs-tag` doesn't add
the `+dfsg` back.

Cheers,
 -- Guido

> 
> Maybe ask on git-buildpackage at lists.sigxcpu.org?
> I am not sure how uscan and git-buildpackage / gbp.conf %(version)s
> interact in this situation and how Guido has designed it is supposed
> to work.
> 
> PS. Final version of blog post is live now:
> https://optimizedbyotto.com/post/debian-source-package-git/
> _______________________________________________
> git-buildpackage mailing list
> git-buildpackage at lists.sigxcpu.org
> http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage
>