Use dist-upgrade to be more thorough

We don't want Debian's package dependency arrangements to interfere with
us getting the right software.
Add missing Makefile dependency