Package: poppler Version: 0.5.4-4 Tags: patch Packages that build-depend on libpoppler-qt-dev or qt4-dev currently fail to build because the qt4 package is missing poppler-page-transition.h [1] and the qt package is missing poppler-link-qt3.h [2]. (Those are Ubuntu bug reports, but apply to Debian as well).
Attached patch fixes both, see the included changelog diff for details. The patch also adds a Recommends:, see [3] for details. Thanks, Martin [1] https://bugs.launchpad.net/ubuntu/+source/poppler/+bug/114186 [2] https://bugs.launchpad.net/ubuntu/+source/poppler/+bug/117388 [3] https://bugs.launchpad.net/ubuntu/+source/poppler/+bug/117530 -- Martin Pitt http://www.piware.de Ubuntu Developer http://www.ubuntu.com Debian Developer http://www.debian.org
diff -u poppler-0.5.4/debian/control poppler-0.5.4/debian/control
--- poppler-0.5.4/debian/control
+++ poppler-0.5.4/debian/control
@@ -83,7 +83,7 @@
Package: libpoppler-qt4-dev
Architecture: any
Section: libdevel
-Depends: libpoppler-qt4-1 (= ${binary:Version}), libpoppler-dev (=${binary:Version}), libqt4-dev
+Depends: libpoppler-qt4-1 (= ${binary:Version}), libpoppler-qt-dev (=${binary:Version}), libqt4-dev
Description: PDF rendering library -- development files (Qt 4 interface)
Poppler is a PDF rendering library based on xpdf PDF viewer.
.
@@ -93,6 +93,7 @@
Architecture: any
Section: utils
Depends: ${shlibs:Depends}
+Recommends: ghostscript
Conflicts: xpdf-utils, pdftohtml (<< 0.36-14)
Replaces: xpdf-utils, pdftohtml, xpdf-reader
Provides: xpdf-utils, pdftohtml
diff -u poppler-0.5.4/debian/libpoppler-qt-dev.install poppler-0.5.4/debian/libpoppler-qt-dev.install
--- poppler-0.5.4/debian/libpoppler-qt-dev.install
+++ poppler-0.5.4/debian/libpoppler-qt-dev.install
@@ -1,4 +1,5 @@
debian/tmp/usr/include/poppler/poppler-qt.h
+debian/tmp/usr/include/poppler/poppler-link-qt3.h
debian/tmp/usr/include/poppler/poppler-page-transition.h
debian/tmp/usr/lib/libpoppler-qt.a
debian/tmp/usr/lib/libpoppler-qt.so
diff -u poppler-0.5.4/debian/changelog poppler-0.5.4/debian/changelog
--- poppler-0.5.4/debian/changelog
+++ poppler-0.5.4/debian/changelog
@@ -1,3 +1,15 @@
+poppler (0.5.4-4ubuntu2) gutsy; urgency=low
+
+ * debian/control: Add dependency libpoppler-qt-dev to libpoppler-qt4-dev, so
+ that build-depending on the latter pulls in the required file
+ poppler-page-transition.h. That's ugly, but still better than shipping the
+ file in both packages and make them conflict to each other. (LP: #114186)
+ * Ship poppler-link-qt3.h in libpoppler-qt-dev. (LP: #117388)
+ * debian/control: Add 'ghostscript' recommends to poppler-utils.
+ (LP: #117530)
+
+ -- Martin Pitt <[EMAIL PROTECTED]> Tue, 29 May 2007 16:21:40 +0200
+
poppler (0.5.4-4ubuntu1) gutsy; urgency=low
* debian/control: Add Conflicts/Replaces to the old library names.
signature.asc
Description: Digital signature
