Changes for fulfill debian policy