Merged r9881:9917 from jcorgan/deb-wip into trunk. Updates Debian/Ubuntu packaging...