Merge packaging changes from Debian
This is a break-out bug from bug 663343.
There are two Debian releases of cheetah that included some packaging changes that we haven't picked up: 2.4.1-1 and then 126.96.36.199-1. We've moved past those versions in terms of the upstream, but when we did so, we didn't sync with Debian's packaging. We should do so now.
Clint Byrum has a branch, originally in bug 663343, that should do the trick.