[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-163-ged06f67
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit dc7919f2d435c5fd1c833f1c8280f715aef35795
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jul 18 18:30:26 2012 +0200
Revert "temporary remove libpoppler-private-dev as poppler 0.18.3-0ubuntu4 doesnt build one"
This reverts commit 7778c032bafef904b772b1f223be1fdd8a17f90d.
We are catching up with debian on this now.
diff --git a/rules b/rules
index d7c405e..5ff49c8 100755
--- a/rules
+++ b/rules
@@ -562,7 +562,7 @@ ifneq "$(ENABLE_PRESENTER_CONSOLE)" "y"
CONFIGURE_FLAGS += --disable-ext-presenter-console
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
- BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev
+ BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev
else
CONFIGURE_FLAGS += --disable-ext-pdfimport
endif
--
LibreOffice packaging repository
Reply to: