[sr-dev] git:master: debian: various fixes and cleanups