Fix debian package and packaging.
Merge pull request #4128 from pchote/deb-fix

Fix debian package and packaging.