On Wed, Feb 09, 2022 at 09:12:39AM +0100, Guido Günther wrote: > Hi Jelmer, > On Tue, Feb 08, 2022 at 07:01:36PM +0000, Jelmer Vernooij wrote: > > Package: git-buildpackage > > Version: 0.9.25 > > Severity: wishlist > > > > Hi Guido! > > > > "gbp dch" generates entries for debian/changelog based on Git commit > > messages. > > > > Best practice in Git is that the first line of a Git commit message is email > > subject-style, i.e. without a trailing dot. > > > > (see > > https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project) > > > > However, the overwhelming practice in Debian (albeit not required or > > explicitly > > recommended by policy) is to use full dots at the end of each item in the > > changelog. > > > > (see > > https://www.debian.org/doc/debian-policy/ch-source.html#debian-changelog-debian-changelog > > for the part of policy that covers the changelog) > > > > This makes it hard to stick to the convention in both systems while using > > gbp dch; > > using commit messages without a trailing dot (per Git convention) means > > having > > to add trailing dots in debian/changelog afterwards. > > > > Would you consider having "gbp dch" add trailing dots in changelog messages > > if > > they're missing? > > Can we use `--customizations=customization-file` here? We could even > ship a customization function in > /usr/share/doc/git-buildpackage/examples/ similar to > /usr/share/doc/git-buildpackage/examples/wrap_cl.py > > gbp-dch tries to stick as possible since everybody has its own > taste. I'm not totally opposed to having a more "d/changelog" like > style built in (maybe a combination of wrap_cl.py and adding a `.`) but > my feeling is that this will result in a large amount of bike shedding. > > Maybe we can about it this way: > > Introduce a /usr/share/doc/git-buildpackage/examples/debian_cl.py that > has all the wanted options, have janitor recommend using that and later > on make it a built in option if it's a style maintainers are happy with?
Yeah, that seems like a reasonable approach. Let me see if I can propose a script that does that. I agree it's probably going to be gnarly to get this right for all cases. Cheers, Jelmer > > > > > (background: discussion in > > https://salsa.debian.org/jelmer/debian-janitor/-/issues/248; > > the janitor attempts to accomodate "gbp dch" users but ends up violating > > Git convention for commit messages by doing so) > > > > Jelmer > > > > -- System Information: > > Debian Release: bookworm/sid > > APT prefers unstable > > APT policy: (500, 'unstable'), (500, 'testing') > > Architecture: amd64 (x86_64) > > > > Kernel: Linux 5.15.0-3-amd64 (SMP w/2 CPU threads) > > Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE > > not set > > Shell: /bin/sh linked to /bin/dash > > Init: systemd (via /run/systemd/system) > > LSM: AppArmor: enabled > > > > Versions of packages git-buildpackage depends on: > > ii devscripts 2.22.1 > > ii git 1:2.34.1-1 > > ii man-db 2.10.0-2 > > ii python3 3.9.8-1 > > ii python3-dateutil 2.8.1-6 > > ii python3-pkg-resources 59.6.0-1.2 > > ii sensible-utils 0.0.17 > > > > Versions of packages git-buildpackage recommends: > > ii cowbuilder 0.89 > > ii pbuilder 0.231 > > ii pristine-tar 1.49 > > ii python3-requests 2.25.1+dfsg-2 > > > > Versions of packages git-buildpackage suggests: > > pn python3-notify2 <none> > > ii sudo 1.9.9-1 > > ii unzip 6.0-26 > > > > -- debconf-show failed > > -- Jelmer Vernooij <jel...@jelmer.uk> PGP Key: https://www.jelmer.uk/D729A457.asc