Suggested changes to help Debian packaging

Hi,

These changes will help Debian packaging. Please consider applying them to the official tree so that they get included in the next release.

(I've just finished signing the CLA).