Debian rebase on master

with necessary debian additions