Finish swift cleanup on debian/ started by Lipu.
Merge pull request #944 from whirm/fix_debian_packaging

Finish swift cleanup on debian/ started by Lipu.