[Merge] ~xypron/ubuntu/+source/rsyslog:merge-lp2045033-noble-8.2312.0-2 into ubuntu/+source/rsyslog:debian/sid

[Nick Rosbrook]

Review: Needs Fixing

The new changes look good to me. My only comments are about the changelog. I'm not sure if it really matters, but I think it would be best to follow the usual conventions, e.g.

   * Merge with Debian unstable (LP: #2045033). Remaining changes:

instead of:

  Merge with Debian unstable (LP: #2045033)

  * Remaining changes:

Also, since you dropped a change, it would be good to elaborate briefly on why it was dropped. In this case it looks like Debian made the same change, so I would say something like:

  * Dropped changes, included in Debian:
    ...

Finally, you have two of each "merge-changelogs" and "reconstruct-changelog" commits which is odd. If you make manual changes to the changelog, I think the convention is to name the commit "update changelog" or simply "changelog". 
-- 
https://code.launchpad.net/~xypron/ubuntu/+source/rsyslog/+git/rsyslog/+merge/457913
Your team Ubuntu Sponsors is requested to review the proposed merge of ~xypron/ubuntu/+source/rsyslog:merge-lp2045033-noble-8.2312.0-2 into ubuntu/+source/rsyslog:debian/sid.