[aur-general] Removal and merge of two Xfce packages