Revert spurious changes to the patches from Debian

When merging the Apertis changes the Debian patches got some undesired changes to the formatting that do not affect anything in practice but introduce a lot of noise when comparing branches.

Sync them back to what the debian/bullseye branch ships so git diff is more useful and we avoid issues when merging updates later.