fda5721896
parts of xpdf, and xpdf -utils provides non-x-depending parts (replacing the no_x11 flavor). Appropriate @conflict marker makes upgrade flawless. While here, remove dependency on a specific version of auto* (prompted by naddy@) (and remember me to never _ever_ touch xpdf again) Change requested by naddy@ espie@ ok sthen@ naddy@