pending: Two more debian specific changes

[ColinIanKing]

Minor cleanups required when doing latest upload to Debian.

[ramesh-thomas]

I have merged the changes into the pending branch. Please let me know if anything needs to be changed.