Merge the two UNRELEASED entries in debian/changelog
Update debian/source/options to follow upstream directory name changes