[sr-dev] git:master: two debian packaging changes to fix package building