I don't git it, but now you will

Debian patching workflow for new upstream versions

Update each patch branch

Merge new upstream + updated patches + master (debian)

Untested alternative merge workflow