I'm attaching a new debdiff that includes the suggestion in comment #9: it also drops option 'single-debian-patch' from debian/source/options. This fixes the additional changes to the 'debian/patches/debian-changes' file.
I'm attaching a new debdiff that includes the suggestion in comment #9: it also drops option 'single- debian- patch' from debian/ source/ options. This fixes the additional changes to the 'debian/ patches/ debian- changes' file.