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

[Johannes Schauer Marin Rodrigues]

Hi,

Quoting Guido Günther (2025-01-20 10:51:15)
> > ah great, so this is supposed to work. Nice! I'm still at a loss though
> > about what my debian/gbp.conf should say such that this works. I consulted
> > gbp-import-orig(1) but didn't find an answer. Currently I have this
> > (contributed by Otto):
> > 
> >     upstream-vcs-tag = v%(version%~%.)s
> > 
> > Note that I'm on Bookworm so my gbp might also be too old?
> 
> Yes, bookworm is too old for that.

I built git-buildpackage from git on Bookworm. This works with these changes:

--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Depends: ${python3:Depends},
  ${shlibs:Depends},
  ${misc:Depends},
  devscripts (>= 2.13.5~),
- git (>= 1:2.40.1-1),
+ git,
  man-db,
  python3-dateutil,
  python3-yaml,
--- a/gbp/deb/upstreamsource.py
+++ b/gbp/deb/upstreamsource.py
@@ -70,4 +70,5 @@ class DebianAdditionalTarball(DebianUpstreamSource):
                 gbp.command_wrappers.RemoveTree(tmpdir)()
 
 
-type DebianUpstreamTarballList = list[DebianUpstreamSource | DebianAdditionalTarball]
+from typing import TypeAlias
+DebianUpstreamTarballList: TypeAlias = list[DebianUpstreamSource | DebianAdditionalTarball]

I see that a more recent git is necessary for the tests to pass but I don't
know if it's also needed for normal operation somewhere? In any case, now ran

    gbp import-orig --uscan --verbose

and indeed it automatically stripped the +dfsg suffix. Thank you!

But this command also seems to put all upstream commits into debian/changelog:

commit f975b8fa17ea332e19f65903ff318d3dc9173112 (HEAD -> debian/latest)
Author: Johannes Schauer Marin Rodrigues <josch at debian.org>
Date:   Mon Jan 20 11:57:53 2025 +0100

    debian/changelog: new entry

 debian/changelog | 5743 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 5743 insertions(+)


Is that intentional? I do not want to have upstream commit messages in my
changelog. I was unable to find an option to disable this in the man page.

Thanks!

cheers, josch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: signature
URL: <http://lists.sigxcpu.org/pipermail/git-buildpackage/attachments/20250120/72e7eee8/attachment.sig>