[arch-general] merging files from pacnew