After discussing this issue with upstream it looks like the right fix will be more intrusive than previously thought, so I just removed the offending patch for now.
Thanks, -- Romain Francoise <rfranco...@debian.org> http://people.debian.org/~rfrancoise/ -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org