Fixes for lintian tag vcs-obsolete-in-debian-infrastructure

Lintian Info page: vcs-obsolete-in-debian-infrastructure