[WIP] Debian changes for 3.5.

This is a continuation of PR #299 which I merged by accident.