Improved generation of apt sources.list