More cleanup.
A makefile fix, and more on debian packaging.
Moved debian packaging commands into makefile.