diff -u poppler-0.12.4/debian/control poppler-0.12.4/debian/control --- poppler-0.12.4/debian/control +++ poppler-0.12.4/debian/control @@ -131,7 +131,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: ghostscript -Conflicts: xpdf-utils, +Conflicts: xpdf-utils (<< 3.02-9), pdftohtml (<< 0.36-14) Replaces: xpdf-utils, pdftohtml, diff -u poppler-0.12.4/debian/changelog poppler-0.12.4/debian/changelog --- poppler-0.12.4/debian/changelog +++ poppler-0.12.4/debian/changelog @@ -1,3 +1,10 @@ +poppler (0.12.4-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Do not conflict with newer versions of xpdf-utils (closes: #586620). + + -- Michael Gilbert Fri, 06 Aug 2010 18:51:54 -0400 + poppler (0.12.4-1) unstable; urgency=low * New upstream release.