The following commit has been merged in the debian-experimental-3.5 branch:
commit 1789703eaa3527608e4a6b116bf8351259150bcd
Author: Rene Engelhard <[email protected]>
Date: Tue Nov 8 01:09:04 2011 +0100
update mozilla conditionals for new --with-system-mozilla-headers, cleanup
(this now only affects the nsplugin)
diff --git a/changelog b/changelog
index f932c93..f839b12 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.0~alpha0~git20111103-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~alpha0~git20111108-1) UNRELEASED; urgency=low
* new upstream snapshot
@@ -22,7 +22,7 @@ libreoffice (1:3.5.0~alpha0~git20111103-1) UNRELEASED;
urgency=low
- move from self-defined UPSTREAM_VERSION/ARCH etc. to use
/usr/share/dpkg/*.mk
- -- Rene Engelhard <[email protected]> Thu, 03 Nov 2011 15:59:56 +0000
+ -- Rene Engelhard <[email protected]> Tue, 08 Nov 2011 00:29:34 +0100
libreoffice (1:3.4.3-4) unstable; urgency=low
diff --git a/control b/control
index 541b4fa..2212cb6 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, 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: 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), xu
lrunner-dev, 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), 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 e3e1d83..877d8d3 100755
--- a/rules
+++ b/rules
@@ -209,8 +209,6 @@ USE_SYSTEM_DMAKE=y
USE_LIBSUITESPARSE=y
SUITESPARSE_MIN_VERSION= (>= 1:3.4.0)
PARALLEL_BUILD=n
-ENABLE_MOZILLA=n
-MOZILLA=libxul
ENABLE_LDAP=y
USE_OPENLDAP=y
ENABLE_OPENGL=y
@@ -280,6 +278,7 @@ SYSTEM_STUFF += db
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
+SYSTEM_STUFF += mozilla-headers
# Default flags to pass to configure of ooo-build
CONFIGURE_FLAGS= \
@@ -296,8 +295,7 @@ CONFIGURE_FLAGS= \
--disable-online-update \
--disable-fetch-external \
--enable-release-build \
- --disable-linkoo \
- --disable-build-mozilla
+ --disable-linkoo
ifneq ($(ON_BUILDD),y)
CONFIGURE_FLAGS += --enable-verbose
@@ -460,12 +458,6 @@ ifeq "$(GCC_VERSION)" ""
endif
endif
-# Note that this does *NOT* only affect the mozilla plugin but also
-# stuff like the xmlsecurity (which uses nss). For the plugin only,
-# change the OOO_NPSOPLUGIN_ARCHS
-OOO_MOZILLA_ARCHS = $(filter-out nothing, $(OOO_ARCHS))
-$(eval $(call gen_no_archs,OOO_MOZILLA_ARCHS))
-
ifeq "$(USE_SOURCE_TARBALLS)" "n"
BUILD_DEPS += , git, rsync
endif
@@ -844,10 +836,13 @@ ifneq (,$(filter nss, $(SYSTEM_STUFF)))
BUILD_DEPS+= , libnss3-dev (>= 3.12.3)
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
endif
-#ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_MOZILLA_ARCHS)))
- CONFIGURE_FLAGS += --disable-mozilla
+ifneq (,$(filter mozilla-headers, $(SYSTEM_STUFF)))
+ BUILD_DEPS+= , xulrunner-dev
+endif
+ CONFIGURE_FLAGS += --disable-build-mozilla --disable-mozilla
+ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NPSOPLUGIN_ARCHS)))
PACKAGE_NPSOPLUGIN=n
-#endif
+endif
ifeq "$(USE_SYSTEM_DMAKE)" "y"
BUILD_DEPS += , dmake (>= 1:4.11)
@@ -936,11 +931,7 @@ ifneq (,$(filter icu, $(SYSTEM_STUFF)))
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)
- else
BUILD_DEPS += , libxmlsec1-dev (>= 1.2.9), libxmlsec1-nss (>= 1.2.9),
libxmlsec1-openssl (>= 1.2.9)
- endif
endif
ifeq "$(BUILD_CAIROCANVAS)" "y"
@@ -3112,7 +3103,6 @@ endif
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)
$(JAVA_COMMON_DEPENDS_VERSION)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'java-gcj-depends=$(JAVA_GCJ_DEPENDS)' \
- -V'mozilla-nss-depends=$(MOZILLA_NSS_DEPENDS)' \
-V'lucene-depends=$(LUCENE_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
--
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]
