Your message dated Sun, 24 May 2026 03:46:33 -0700
with message-id <[email protected]>
and subject line Re: Bug#1137468: dgit: merged changelog does not honor
--debbuildopts="-v<version>"
has caused the Debian Bug report #1137468,
regarding dgit: merged changelog does not honor --debbuildopts="-v<version>"
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1137468: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1137468
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dgit
Version: 15.9
Severity: normal
Dear Maintainer,
When trying to build a backport of a package, it was suggested to pass
`--debbuildopts="-v<version>"' so that not only changelog of the
backport version (which is usually just "Rebuild for backports"), but
also all the changes from the previous versions after <version> are
included. Say stable has 1.0-1, and testing has 1.1-1, and with
`--debbuildopts="-v1.0-1"' I can have the changelog of both 1.1-1 and
1.1-1~bpo13+1.
When I tried to add this to the dgit command, e.g. `dgit
sbuild -d trixie-backports --debbuildopts="-v<1.0-1>"', the resulting
*_multi.changes only contain the change for 1.1-1~bpo13+1. On close
inspection, the *_amd64.changes file did include the changelog of 1.1-1,
but the *_source.changes did not. As (I think) dgit uses `mergechanges'
to combine these 2 changelogs into *_multi.changes, the *_source.changes
took over so the other changelog is lost.
I'm not sure whether this is a dgit issue or a sbuild issue,
specifically whether it is caused by how dgit invokes sbuild or sbuild
somehow does not generate the intended *_source.changes with
`--debbuildopts="-v<version>"'.
-- System Information:
Debian Release: forky/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (200, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 7.0.9+deb14-amd64 (SMP w/2 CPU threads; PREEMPT)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages dgit depends on:
ii apt 3.3.1
ii ca-certificates 20260223
ii coreutils 9.10-1
ii curl 8.20.0-2
ii devscripts 2.26.9
ii dpkg-dev 1.23.7
ii dput 1.2.4
ii git 1:2.53.0-1
ii git-buildpackage 0.9.42
ii libdpkg-perl 1.23.7
ii libjson-perl 4.10000-1
ii liblist-moreutils-perl 0.430-2
ii liblocale-gettext-perl 1.07-10
ii libtext-csv-perl 2.06-1
ii libtext-glob-perl 0.11-3
ii libtext-iconv-perl 1.7-9
ii libwww-curl-perl 4.17-13+b1
ii perl [libdigest-sha-perl] 5.40.1-7+b1
ii python3 3.13.9-3+b1
Versions of packages dgit recommends:
ii distro-info-data 0.69
ii liburi-perl 5.34-2
ii openssh-client [ssh-client] 1:10.3p1-2
Versions of packages dgit suggests:
ii sbuild 0.91.9
-- no debconf information
--
Regards,
Xiyue Deng
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
Hi Ian,
Ian Jackson <[email protected]> writes:
> Xiyue Deng writes ("Bug#1137468: dgit: merged changelog does not honor
> --debbuildopts="-v<version>""):
>> When trying to build a backport of a package, it was suggested to pass
>> `--debbuildopts="-v<version>"' so that not only changelog of the
>> backport version (which is usually just "Rebuild for backports"), but
>> also all the changes from the previous versions after <version> are
>> included. Say stable has 1.0-1, and testing has 1.1-1, and with
>> `--debbuildopts="-v1.0-1"' I can have the changelog of both 1.1-1 and
>> 1.1-1~bpo13+1.
>
> I think you need to do this with dgit's -v option, rather than
> sbuild's --debbuildopts. Hopefully that will work. Please let us
> know if not.
>
This indeed works. I definitely missed that dgit has its own "-v"
option. Would be good to make it more visible somewhere (maybe somewhere
on the wiki?)
In any case, this bug can be considered resolved, and I'm closing this.
> As you've noted, the output from sbuild is used for the binary
> packages. The changelog information comes from the *_source.changes.
> dgit makes that itself with a separate call call to dpkg-genchnages.
>
Ack. This seems to be the cause of my confusion.
> BTW, dgit normally calculates the previous version automatically.
> But, that calcuation sometimes isn't right for backports. That's
> #1109584 and #854377.
>
Thanks for the pointers! Would be good if dgit/git-debpush would just
DTRT(TM). I saw there were some controversies. Just putting some random
thought: maybe making this configurable as a git option and let people
choose one is worth considering.
> Regards,
> Ian.
--
Regards,
Xiyue Deng
signature.asc
Description: PGP signature
--- End Message ---
