The following commit has been merged in the debian-experimental-3.5 branch:
commit b6bdc8bcd4353638c73ce25356b259ac44614789
Author: Rene Engelhard <[email protected]>
Date: Tue Nov 8 00:21:38 2011 +0100
--with-system-libxml got merged into --with-system-libxml
diff --git a/control b/control
index 59cd513..541b4fa 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <[email protected]>
Uploaders: Rene Engelhard <[email protected]>
-Build-Depends: dpkg-dev (>= 1.16.1), 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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, git, rsync, libgl1-mesa-dev [!armel !mips
!mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0),
libpoppler-cpp-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel
!sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libexpat1-dev,
unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev,
libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev
(>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), tcsh,
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, libbase-java [!armel], libsac-java
[!armel], libxml-java (>= 1.1.6) [!armel], libflute-java (>= 1.1.6) [!armel],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel], liblayout-java (>=
0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel], libformula-java (>=
1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel], libfonts-java (>=
1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel],
libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~), 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), libvisio-dev, libcmis-dev, 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), libgtk-3-dev (>=
3.2~), 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, gettext, libldap2-dev
+Build-Depends: dpkg-dev (>= 1.16.1), 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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, git, rsync, libgl1-mesa-dev [!armel !mips
!mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0),
libpoppler-cpp-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel
!sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxslt1-dev,
libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev,
libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~),
libcppunit-dev (>
= 1.12), tcsh, 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, libbase-java [!armel], libsac-java
[!armel], libxml-java (>= 1.1.6) [!armel], libflute-java (>= 1.1.6) [!armel],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel], liblayout-java (>=
0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel], libformula-java (>=
1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel], libfonts-java (>=
1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel],
libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev
(>= 3.12.3), dm
ake (>= 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), libvisio-dev, libcmis-dev,
libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>=
4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk-3-dev (>=
3.2~), 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, gettext, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
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 bd6eac1..e3e1d83 100755
--- a/rules
+++ b/rules
@@ -150,7 +150,6 @@ SYSTEM_STUFF += mdds
SYSTEM_STUFF += vigra
USE_EXTERNAL_CXXLIBS=y
#SYSTEM_STUFF += sablot
-SYSTEM_STUFF += libxslt
SYSTEM_STUFF += mythes
SYSTEM_STUFF += icu
ICU_MINVER= (>= 4.0)
@@ -530,6 +529,8 @@ ifneq (,$(filter jpeg, $(SYSTEM_STUFF)))
endif
ifneq (,$(filter libxml, $(SYSTEM_STUFF)))
BUILD_DEPS += , libxml2-dev
+ BUILD_DEPS += , libxslt1-dev
+ DBG_DBG_SUGGESTS+= , libxslt1-dbg
endif
ifneq (,$(filter expat, $(SYSTEM_STUFF)))
BUILD_DEPS += , libexpat1-dev
@@ -934,11 +935,6 @@ ifneq (,$(filter icu, $(SYSTEM_STUFF)))
BUILD_DEPS += , libicu-dev $(ICU_MINVER)
endif
-ifneq (,$(filter libxslt, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libxslt1-dev
- DBG_DBG_SUGGESTS+= , libxslt1-dbg
-endif
-
ifneq (,$(filter xmlsec, $(SYSTEM_STUFF)))
ifneq (,$(findstring xul,$(MOZILLA)))
BUILD_DEPS += , libxmlsec1-dev (>= 1.2.9-1.1), libxmlsec1-nss (>=
1.2.9-1.1), libxmlsec1-openssl (>= 1.2.9-1.1)
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
