Upstream merge of Debian 2.42.1 packaging (excluding quilt patches)

Source has been updated with changes from git and we use the Debian
packaging data here to match those up.

[endlessm/eos-shell#3276]