Install the versatile apt-file
Merge upstream and local changes
Refactored apt config based on the apt cookbook