Fix debian package and packaging.

Squashes and removes the unrelated packaging log changes from #4118.