Fix orig fetching

Ian Jacksonrequested to merge
get-orig into master

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1105766

This turned out to be quite a hairy yak herd.

My local tests are still running, hence the draft status. I may yet rebase the branch.

@spwhitton, I'm not sure if you actually want to review this at all. LMK.

Merge request reports