Hi,

I'm sorry to tell you that my earlier patches for duplicating diversions
affected by the /usr-move are subtly wrong. There are known failures in
live-build which uses very similar code. The full story can be found at
https://lists.debian.org/debian-devel/2025/01/msg00125.html.

As a result, I'm attaching an updated upstream/0002-usr-move.patch
(meant to replace the current one). Main changes:
 * Pass --rename to one diversion call only depending on whether the
   affected file presently is aliased or not.
 * Bump the removal markers back to forky, because this code will likely
   be used to install trixie for a while and thus may be affected during
   the forky cycle still.
 * Update more references of the aliased names to the canonical names.

I have little clue to how test these changes and there are no
autopkgtests either. Would you be able to give them a try before
uploading? They are quite similar to how its done in other affected
packages though.

Helmut