Andrew,
merges from Experimental are OK so you don't have to add also the debian changes to the debdiff.
Besides, you made some changes without mentioning them.
I've done a proper merge which means I took the Debian sources files and only added the b-p, changed maintainer and added the changelog entries for you.
Would you mind reporting our changes back to Debian so we can sync next time?
Andrew,
merges from Experimental are OK so you don't have to add also the debian changes to the debdiff.
Besides, you made some changes without mentioning them.
I've done a proper merge which means I took the Debian sources files and only added the b-p, changed maintainer and added the changelog entries for you.
Would you mind reporting our changes back to Debian so we can sync next time?