On Sun Jan 25, 2026 at 4:02 PM CET, Michael Tokarev wrote:
Ohh. I failed to realize the talk's about bookworm, not trixie, - even
if everything mentions that! And you're proposing to update it, not
to introduce a new backport for trixie. Heh.
Yes, I did make postfix backport to bookworm, - in order to have the
changes in packaging there - namely the multi-instance and logging
changes.
Ahah, I suspected my original message was misinterpreted :)
Okay, lemme re-read what you wrote once again with this in mind.. :)
And now I'm confused. Usually when I do a backport of version Y,
I start with that version Y, exactly, and re-apply whatever changes
needed for backport of previous version X, X~bpo12+1. So the history
(d/changelog) for Y~bpo12+1 does not include changes between X and
X~bpo12+1. In your case though, it looks like you started from
X~bpo12+1, and picked up the subsequent changes from the master
branch, so version Y in your new history also includes changes
between X and X~bpo12+1, which are missing in actual version Y.
Maybe I miss some tooling or a common way of doing things?
This is why I mentioned the changes you "did not" put to the
changelog - because they're already there before.
What I did instead was starting from the already-existing backported
version, and merged all the changes from trixie into that. Since I don't
know how you personally maintain your package in Git, I've used dgit
which offers a unified git view of packages, regardless of the specific
workflow you use.
In simple commands, I did this:
$ dgit clone postfix bookworm-backports
$ cd postfix
$ dgit fetch trixie
$ git merge --strategy-option=theirs --allow-unrelated-histories --no-commit
dgit/dgit/trixie
$ vim debian/{control,rules} # re-apply the bpo changes lost in the merge
$ git merge --continue
$ dch --distribution bookworm-backports --bpo
$ git commit --message='update backport' debian/changelog
$ dgit --since-version=3.10.3-2~bpo12+1 sbuild
The git-merge command is a bit long since it tells git to always keep
the changes from trixie in case there's a conflict. This also means,
though, that the bpo changes to debian/control and debian/rules were
overwritten by the automatic merge, and I had to re-add them manually.
Finally, the dgit --since-version option is used so that all the
relevant changelog entries are included in the .changes file.
I'm not sure whether this is more or less complicated of what you do,
but it works for me :)
Bye!
