Hi,

I have updated my patches (the ChangeLogs) against latest bzr.  Hope
that's helpful.  Attached as bundles and GIT patches.

Not sure what's most helpful for you; what we did in LibreOffice, was
to send the ChangeLog bit verbatim and omit it from the patch and have
the committer add it to the ChangeLog, as it "always" conflicts.

Hope this helps, Greetings,
Jan