Re: Debianized upstream source branch name
On Tue, 2025-11-18 at 15:58 +0100, Thomas Goirand wrote:
> On 11/18/25 2:20 AM, Aeliton G. Silva wrote:
> > Hi DPT,
> >
> > I've found a small inconsistency in between [1] (section Branch
> > names)
> > and [2] (section Git Branch Names).
> >
> > The wiki says:
> >
> > * "debian/main (formerly debian/master) - The Debianized upstream
> > source directory..."
> >
> > and the policy.rst says:
> > * "debian/master - The Debianized upstream source directory...".
> >
> > Which one is correct?
> >
> > I was having a look at the python-lsp-server repository and the
> > branch
> > debian/main does not exist whilst debian/master does.
> >
> >
> > Cheers,
> > Aeliton
>
> I'm sorry to say it strait like this, but none of the answers of this
> thread are right.
>
> The *only* source of truth *must* be the VCS URLs as per
> debian/control.
> So you should, in theory, only look at the Vcs-Git: of a give
> package,
> and a "debcheckout" call should be pulling the correct package (if
> your
> source.list contains unstable).
>
> If this isn't the case, you're free to file a bug. The maintainer can
> correct it by either:
> - changing the default branch in Salsa
>
> This can be done with a simple curl:
>
> curl ${CURL_OPT} -H "Content-Type: application/json" \
> --header "PRIVATE-TOKEN: ${SALSA_TOKEN}" \
> -X PUT \
> --data '{ "default_branch": "debian/'${NEW_RELEASE}'" }' \
> https://salsa.debian.org/api/v4/projects/${PROJECT_ID}
>
> or with your preferred command line wrapper.
>
> - adding the branch name in the VCS URL
>
> Yes, this is less known, but this can be part of the Vcs-Git field.
>
> As stated above: if it's not the case, feel free to file a bug.
>
> Cheers,
>
> Thomas Goirand (zigo)
Thanks Thomas, This shed some light on what I read at [1](see NOTE
under "For development releases"), quoting it here:
"NOTE: If the Git repository listed in debian/control's Vcs-Git field
does not indicate an explicit branch (with the -b <branch> suffix) then
it should have its HEAD point to the branch where new upstream versions
are being packaged (that is one of the branches associated to a
development release)..."
So the complete answer to me right now would be:
1) The branch stated in debian/control Vcs-Git; or
2) If branch not stated,
2.1. Check the default branch in salsa; or
2.2. use 'git ls-remote --symref <repo> HEAD', as it should be
pointing to the branch desired branch (as Peter suggested).
Is this the correct understanding?
1 - https://dep-team.pages.debian.net/deps/dep14/
Reply to: