The following commit has been merged in the master branch:
commit b5df8490bb34a89e37566fcd66af754a4033f15e
Author: Rene Engelhard <r...@debian.org>
Date: Sat Feb 11 18:54:49 2012 +0100
add additional libpoppler-private-dev build-dep for new popplers
diff --git a/changelog b/changelog
index b5f5a18..0aa894a 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,7 @@ libreoffice (1:3.4.5-3) UNRELEASED; urgency=low
times; strip pre-libreoffice entries otherwise.
- enable ca-XV, put into -{l10n,help}-ca
- backport from 3.5: don't add unversioned base-files dependency in base
+ - add additional libpoppler-private-dev build-dep for new popplers
*
ext-sources/ext-sources/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz:
add missing file which should have been in updated .orig-ext-sources..
* debian/libreoffice-sdbc-postgresql.preinst.in: cleanup to avoid dpkg
diff --git a/control b/control
index 491bfe0..a30c7b2 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <r...@debian.org>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel
!mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>=
0.8.0), libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc],
libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, dpkg-dev
(>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~),
libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel
armhf
i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk
[ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa
kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64
kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), mingw-w64 (>= 1.0),
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java, libservlet2.5-java (>= 1.1.1-9), libbase-java [!armel
!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>=
0.9.4) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>=
0.2.10) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>=
1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>=
1.1.7) [!armel !hppa !kfr
eebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java, libservlet2.5-java
(>= 1.1.1-9), javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>= 3.12.3),
dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>=
0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2),
libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0),
libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev
[!armel], libpq-dev (>= 9.0~), libxrandr-dev, liblucene2-java (>= 2.3.2),
libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>=
5.5.0.13-5+b1), lp-solve (>
= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>=
0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev,
liborbit2-dev, libldap2-dev
+Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel
!mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>=
0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3)
[!armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev,
libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev,
debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~pre8-2)
[alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x
sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>=
1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>=
1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java,
libcommons-lang-java, libcommons-logging-java, libservlet2.5-java (>= 1.1.1-9),
libbase-java [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel
!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>=
0.9.4) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>=
0.2.10) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>=
1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1
.1.7) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>=
1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6)
[!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6)
[!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java,
libservlet2.5-java (>= 1.1.1-9), javahelper (>= 0.37~), xulrunner-dev,
libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>=
1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0),
libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0),
libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4),
libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791),
libebook1.2-dev [!armel], libpq-dev (>= 9.0~), libxrandr-dev, liblucene2-java
(>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>=
5.5
.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0),
libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev,
libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10),
libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge,
translate-toolkit (>= 1.9)
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa
kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11),
base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
diff --git a/rules b/rules
index 31bed61..299bea4 100755
--- a/rules
+++ b/rules
@@ -524,7 +524,11 @@ ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
CONFIGURE_FLAGS += --enable-ext-pdfimport
+ ifneq "$(SQUEEZE_BACKPORTS)" "y"
+ BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev
+ else
BUILD_DEPS += , libpoppler-dev (>= 0.8.0)
+ endif
BUILD_DEPS += , libpoppler-cpp-dev
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rwha8-00036z...@vasks.debian.org
