Make upgrade_amavis depend on amavisd-new instead of amavisd-cn.