Comment 1 for bug 637131

Partial *stripped* ~200 line debdiff attached (note that this is stripped of 20,000 lines of auto-cruft and font metrics churn output where 'debdiff' has basically spewed the whole thing).

Also drops one Debian patch where upstream now provides a better fix.