Bug 21745 - file conflicts between evince and evince-gtk

Summary: file conflicts between evince and evince-gtk