Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #17166 > unrolled thread

Re: Debianized upstream source branch name

Back to article view | Back to linux.debian.maint.python

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: Debianized upstream source branch name Andrey Rakhmatullin <wrar@debian.org> - 2025-11-18 09:10 +0100
    Re: Debianized upstream source branch name Nick Morrott <knowledgejunkie@gmail.com> - 2025-11-18 09:40 +0100
      Re: Debianized upstream source branch name Andrey Rakhmatullin <wrar@debian.org> - 2025-11-18 09:40 +0100
        Re: Debianized upstream source branch name Nick Morrott <knowledgejunkie@gmail.com> - 2025-11-18 12:20 +0100
          Re: Debianized upstream source branch name Andrey Rakhmatullin <wrar@debian.org> - 2025-11-18 12:30 +0100
      Re: Debianized upstream source branch name Peter Pentchev <roam@ringlet.net> - 2025-11-18 11:30 +0100

#17166 — Re: Debianized upstream source branch name

[Multipart message — attachments visible in raw view] — view raw

On Mon, Nov 17, 2025 at 10:20:39PM -0300, 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?

In general, between a wiki page and a policy doc usually the policy doc is more 
important. Somebody changed the wiki page, this didn't lead to changing 
the policy doc or the actual policy.

But in this case the difference doesn't mean much, because this is not an 
enforced requirement. Some (many?) repos don't use either of these at all, 
using master (or I guess main).

>I was having a look at the python-lsp-server repository and the branch
>debian/main does not exist whilst debian/master does.

Yes, you need to look at the branches to find which is the debian-branch 
one.

-- 
WBR, wRAR

[toc] | [next] | [standalone]

#17167

On Tue, 18 Nov 2025 at 08:00, Andrey Rakhmatullin <wrar@debian.org> wrote:
>
> On Mon, Nov 17, 2025 at 10:20:39PM -0300, Aeliton G. Silva wrote:

<snip>

> >I was having a look at the python-lsp-server repository and the branch
> >debian/main does not exist whilst debian/master does.
>
> Yes, you need to look at the branches to find which is the debian-branch
> one.

If in doubt, always check to see if debian/gbp.conf exists and what
debian-branch is set to.

In the case of python-lsp-server [0], it shows:

[DEFAULT]
upstream-branch = upstream
debian-branch = debian/master


Cheers,
Nick

[0] https://salsa.debian.org/python-team/packages/python-lsp-server/-/blob/debian/master/debian/gbp.conf

[toc] | [prev] | [next] | [standalone]

#17168

[Multipart message — attachments visible in raw view] — view raw

On Tue, Nov 18, 2025 at 08:30:55AM +0000, Nick Morrott wrote:
>If in doubt, always check to see if debian/gbp.conf exists and what
>debian-branch is set to.

And in which branch would you look for this file?

-- 
WBR, wRAR

[toc] | [prev] | [next] | [standalone]

#17170

On Tue, 18 Nov 2025 at 08:39, Andrey Rakhmatullin <wrar@debian.org> wrote:
>
> On Tue, Nov 18, 2025 at 08:30:55AM +0000, Nick Morrott wrote:
> >If in doubt, always check to see if debian/gbp.conf exists and what
> >debian-branch is set to.
>
> And in which branch would you look for this file?

I generally check the default gbp clone branch first! (apologies for
the useless comment above...)

My experience with using "gbp clone" just now was as follows:

----

$ gbp clone https://salsa.debian.org/python-team/packages/test-stages.git
gbp:info: Cloning from
'https://salsa.debian.org/python-team/packages/test-stages.git'

nick on krusty in ~/d/s/g/debian-packaging
$ cd test-stages

nick on krusty in ~/d/s/g/d/test-stages (debian/unstable )

----

$ gbp clone https://salsa.debian.org/python-team/packages/python-lsp-server.git
gbp:info: Cloning from
'https://salsa.debian.org/python-team/packages/python-lsp-server.git'

nick on krusty in ~/d/s/g/debian-packaging
$ cd python-lsp-server

nick on krusty in ~/d/s/g/d/python-lsp-server (debian/master )

----

$ gbp clone https://salsa.debian.org/python-team/packages/babelfish.git
gbp:info: Cloning from
'https://salsa.debian.org/python-team/packages/babelfish.git'

nick on krusty in ~/d/s/g/debian-packaging
$ cd babelfish

nick on krusty in ~/d/s/g/d/babelfish (master )

----

For each of those 3 repos, I seemingly end up on the default branch
(which is different for each repo), which seems to be what the OP
wants. That's the branch I would look in for a d/gbp.conf file.

Additionally, the OP could also:

i) inspect the repo on the salsa web interface and see which branch is
marked as default
ii) download the debian source package and inspect the gbp.conf file if present
iii) check Peter's remote interrogation solution

Cheers,
Nick

[toc] | [prev] | [next] | [standalone]

#17171

[Multipart message — attachments visible in raw view] — view raw

On Tue, Nov 18, 2025 at 11:13:42AM +0000, Nick Morrott wrote:
>> >If in doubt, always check to see if debian/gbp.conf exists and what
>> >debian-branch is set to.
>>
>> And in which branch would you look for this file?
>
>I generally check the default gbp clone branch first! 

In most cases this already answers the question.
It doesn't only when the maintainer forgot (or most likely didn't know 
how/didn't know they need it) to change it on salsa when changing the 
debian-branch from one to another.

>For each of those 3 repos, I seemingly end up on the default branch
>(which is different for each repo), which seems to be what the OP
>wants. 

> That's the branch I would look in for a d/gbp.conf file.

As I said, this step is unnecessary because you alreadu have the answer. 
Also, it will always contain the name of current branch or none (or be 
incorrect).

>Additionally, the OP could also:
>
>i) inspect the repo on the salsa web interface and see which branch is
>marked as default
>ii) download the debian source package and inspect the gbp.conf file if present
>iii) check Peter's remote interrogation solution

True.
Though it depends on the problem being solved.

-- 
WBR, wRAR

[toc] | [prev] | [next] | [standalone]

#17169

[Multipart message — attachments visible in raw view] — view raw

On Tue, Nov 18, 2025 at 08:30:55AM +0000, Nick Morrott wrote:
> On Tue, 18 Nov 2025 at 08:00, Andrey Rakhmatullin <wrar@debian.org> wrote:
> >
> > On Mon, Nov 17, 2025 at 10:20:39PM -0300, Aeliton G. Silva wrote:
> 
> <snip>
> 
> > >I was having a look at the python-lsp-server repository and the branch
> > >debian/main does not exist whilst debian/master does.
> >
> > Yes, you need to look at the branches to find which is the debian-branch
> > one.
> 
> If in doubt, always check to see if debian/gbp.conf exists and what
> debian-branch is set to.

As others said, "in which branch would you look for that file?" :)

So another recommendation: if in doubt, check the package out from
its Salsa repo and see which branch you get. I assume that this may be
automated either via the Salsa API; there is also a somewhat weirder way:

  [roam@straylight ~]$ git ls-remote --symref https://salsa.debian.org/python-team/packages/test-stages.git HEAD
  ref: refs/heads/debian/unstable HEAD
  123b8be7b574032315c544ebe90d820cfa608a7c        HEAD
  [roam@straylight ~]$

...so for this repo, the default branch is debian/unstable.

G'luck,
Peter

-- 
Peter Pentchev  roam@ringlet.net roam@debian.org peter@morpheusly.com
PGP key:        https://www.ringlet.net/roam/roam.key.asc
Key fingerprint 2EE7 A7A5 17FC 124C F115  C354 651E EFB0 2527 DF13

[toc] | [prev] | [standalone]

Back to top | Article view | linux.debian.maint.python

csiph-web