The main goal going in was to address #952200, but since I was touching the package anyway I took the opportunity to bring it up to the latest Debian standards and clean up a few things.
@agx I'll wait for your thumbs up before merging.
