[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-1-22-g17df62d

The following commit has been merged in the debian-experimental-3.5 branch:
commit 6bb9680004e13ba50cdc9a1d863fbc821a1e3e55
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Feb 21 22:22:11 2012 +0000

    fix s390 build by disabling the extensions; work around missing packages on s390x in addition

diff --git a/changelog b/changelog
index 876a124..6679b0f 100644
--- a/changelog
+++ b/changelog
@@ -20,12 +20,15 @@ libreoffice (1:3.5.0-2) UNRELEASED; urgency=low
       to new names in 3.5.x; remove some obsolete ones
     - don't try to mv libvclplug_gtk3.so if not built, thanks Rico
       Tzschichholz again
+    - disable base (libebook1.2-dev missing and nsplugin (xulrunner-dev
+      missing) on s390x
+    - disable *all* extensions on s390*, extension mechanism broken
 
   [ Bjoern Michaelsen ]
   * debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
     (closes: #660580)
 
- -- Rene Engelhard <rene@debian.org>  Tue, 21 Feb 2012 17:10:12 +0000
+ -- Rene Engelhard <rene@debian.org>  Tue, 21 Feb 2012 19:47:58 +0000
 
 libreoffice (1:3.5.0-1) experimental; urgency=low
 
diff --git a/control b/control
index 1288cac..1402ac1 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 <rene@debian.org>
-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, 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], 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),
  junit4 (>= 4.8.2-2), 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~), libnss3-dev (>= 3.12.3), xulrunner-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, libsampleicc-dev, libicc-utils-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), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1
 .2-dev [!armel !powerpc !powerpcspe !ppc64], 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.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), 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, 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], 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),
  junit4 (>= 4.8.2-2), 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~), libnss3-dev (>= 3.12.3), xulrunner-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, libsampleicc-dev, libicc-utils-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), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1
 .2-dev [!armel !powerpc !powerpcspe !ppc64 !s390x], 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.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), 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
@@ -16,7 +16,7 @@ Homepage: http://www.libreoffice.org
 Package: libreoffice
 Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
 Section: metapackages
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base [!armel !powerpc !powerpcspe !ppc64], libreoffice-report-builder-bin [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev, ${lucene-depends}, ${java-common-depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base [!armel !powerpc !powerpcspe !ppc64 !s390x], libreoffice-report-builder-bin [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev, ${lucene-depends}, ${java-common-depends}, ${misc:Depends}
 Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils
 Suggests: hunspell-dictionary, myspell-dictionary, libreoffice-help-${help-l10n-virtual-version}, libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane, hyphen-hyphenation-patterns, mythes-thesaurus, libxrender1, libgl1, libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick | graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests}, ${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
 Description: office productivity suite
@@ -143,7 +143,7 @@ Description: office productivity suite -- arch-independent Java support files
 
 Package: libreoffice-writer
 Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}) [!armel !powerpc !powerpcspe !ppc64], ${shlibs:Depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}) [!armel !powerpc !powerpcspe !ppc64 !s390x], ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, libreoffice-emailmerge, libreoffice-math
 Replaces: libreoffice-core (<< 1:3.3.2-5)
 Suggests: libreoffice-gcj, libreoffice-base
@@ -155,7 +155,7 @@ Description: office productivity suite -- word processor
 
 Package: libreoffice-calc
 Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}) [!armel !powerpc !powerpcspe !ppc64], ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}) [!armel !powerpc !powerpcspe !ppc64 !s390x], ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
 Description: office productivity suite -- spreadsheet
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -190,7 +190,7 @@ Description: office productivity suite -- equation editor
  This package contains the equation editor component for LibreOffice.
 
 Package: libreoffice-base-core
-Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 sparc kfreebsd-amd64 kfreebsd-i386
 Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libreoffice-base
 Description: office productivity suite -- shared library
@@ -204,7 +204,7 @@ Description: office productivity suite -- shared library
  install libreoffice-base.
 
 Package: libreoffice-base
-Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 sparc kfreebsd-amd64 kfreebsd-i386
 Section: database
 Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${java:Depends}, ${java-common-depends}, ${misc:Depends}
 Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libjtds-java, libreoffice-gcj, libreoffice-report-builder
@@ -3111,7 +3111,7 @@ Description: office productivity suite -- Java libraries for GIJ
 
 Package: mozilla-libreoffice
 Section: net
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 sparc kfreebsd-amd64 kfreebsd-i386
 Enhances: iceape-browser,
  iceweasel,
  mozilla-browser,
@@ -3192,7 +3192,7 @@ Description: LibreOffice extension for building database reports -- libraries
 
 Package: libreoffice-presentation-minimizer
 Section: misc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
 Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, ${misc:Depends}
 Enhances: libreoffice-impress
 Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@ -3211,7 +3211,7 @@ Homepage: http://extensions.services.openoffice.org/project/PresentationMinimize
 
 Package: libreoffice-presenter-console
 Section: misc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
 Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
 Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, ${misc:Depends}
 Enhances: libreoffice-impress
@@ -3236,7 +3236,7 @@ Homepage: http://extensions.services.openoffice.org/project/presenter-screen
 Package: libreoffice-pdfimport
 Section: misc
 Priority: extra
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
 Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
 Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
 Description: LibreOffice extension for importing PDF documents
@@ -3336,7 +3336,7 @@ Description: office productivity suite -- KDE integration
 
 Package: libreoffice-sdbc-postgresql
 Section: misc
-Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 sparc kfreebsd-amd64 kfreebsd-i386
 Depends: ${shlibs:Depends}, libreoffice-core (>= 1:3.5.0~beta), ${misc:Depends}
 Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
 Suggests: postgresql (>= 8.4)
@@ -3350,7 +3350,7 @@ Homepage: http://wiki.documentfoundation.org/PostgreSQL-SDBC
 
 Package: libreoffice-mysql-connector
 Section: misc
-Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 sparc kfreebsd-amd64 kfreebsd-i386
 Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
 Suggests: mysql-server (>= 5.1)
 Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@ -3363,7 +3363,7 @@ Description: MySQL Connector extension for LibreOffice
  LibreOffice without any wrapper layer such as ODBC or JDBC.
 
 Package: libreoffice-evolution
-Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 sparc kfreebsd-amd64 kfreebsd-i386
 Section: gnome
 Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>= 1:3.4.0~), libreoffice-base, ${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
 Recommends: evolution
diff --git a/patches/smoketest-disable-extension-tests.diff b/patches/smoketest-disable-extension-tests.diff
new file mode 100644
index 0000000..1b69d00
--- /dev/null
+++ b/patches/smoketest-disable-extension-tests.diff
@@ -0,0 +1,97 @@
+--- smoketest/data/Test_Ext.xml	2012-02-01 13:56:49.000000000 +0100
++++ smoketest/data/Test_Ext.xml	2012-02-20 20:15:23.000000000 +0100
+@@ -28,10 +28,6 @@
+ <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
+ <script:module xmlns:script="http://openoffice.org/2000/script"; script:name="Test_Ext" script:language="StarBasic">REM  *****  BASIC  *****
+ 
+-const cMessageExtensionService = &quot;Extension Service&quot;
+-const cMessageExtensionInstall = &quot;Install Extension&quot;
+-const cMessageExtensionUninstall = &quot;Uninstall Extension&quot;
+-
+ Sub TestExtensions
+     Dim oTestExtension as Object, obj_null as Object
+     Dim sCurrentMessage as String
+@@ -37,9 +37,6 @@
+     Dim sCurrentMessage as String
+     Dim bResult as Boolean
+     Dim sImplementationNameString as String
+-    sImplementationNameString = cUnoSmoketestTestExtension + &quot;$_TestExtension&quot;
+-
+-    On Local Error GoTo EXTERROR
+
+     gCurrentTestCase = cLogfileFailed
+     LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest))
+@@ -44,73 +40,5 @@
+     gCurrentTestCase = cLogfileFailed
+     LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest))
+ 
+-    sCurrentMessage = cMessageExtensionService
+-    gCurrentTestCase = cEXTService
+-
+-    &apos;Create an implementation of com.sun.star.ucb.XCommandEnvironment which is needed for
+-    &apos;adding the extension. The implementation is in
+-    &apos;javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java and the code is in juh.jar
+-    cmdEnv = createUnoService(cUnoSmoketestCommandEnvironment)
+-
+-    &apos;Create the component context and then get the singleton ExtensionManager
+-    &apos;A singleton cannot be created with createUnoService
+-    ctx = getDefaultContext
+-    ext_mgr = ctx.getValueByName(&quot;/singletons/&quot; + cExtensionManager)
+-
+-    LogTestResult( &quot;Extension &quot;+ cMessageExtensionService, not IsNull (ext_mgr) )
+-    if (IsNull(ext_mgr)) then
+-        Close #LocalTestLog%
+-        LocalTestLog = 0
+-        Exit Sub
+-    End If
+-
+-    sCurrentMessage = cMessageExtensionInstall
+-    gCurrentTestCase = cEXTInstall
+-
+-    &apos;Add the extension. We must provide a file URL here.
+-    &apos;By passing &quot;user&quot; we determine that the actions we perform on
+-    &apos;XExtensionManager only affect the user installation. To modify the share installation one would pass &quot;share&quot;.
+-
+-    Dim props() as Object
+-    ext_mgr.addExtension(sExtensionURL + cExtensionFileName, props, &quot;user&quot;, obj_null, cmdEnv)
+-
+-    &apos;Check if the extension has been added by creating a service which is contained in the extension.
+-    oTestExtension = createUnoService(cUnoSmoketestTestExtension)
+-    bResult = (oTestExtension.getImplementationName = sImplementationNameString)
+-    LogTestResult( &quot;Extension &quot;+ cMessageExtensionInstall, bResult )
+-    if (not bResult) then
+-        Close #LocalTestLog%
+-        LocalTestLog = 0
+-        Exit Sub
+-    End If
+-
+-    sCurrentMessage = cMessageExtensionUninstall
+-    gCurrentTestCase = cEXTUninstall
+-
+-    &apos;Remove the package
+-    ext_mgr.removeExtension(&quot;org.openoffice.legacy.&quot; + cExtensionFileName, cExtensionFileName, &quot;user&quot;,obj_null, cmdEnv)
+-
+-    &apos;Try to create the service which is contained in the now removed extension.
+-    oTestExtension = createUnoService(cUnoSmoketestTestExtension)
+-
+-    &apos;The service must not be available anymore. Therefor isNull must return true.
+-    LogTestResult( &quot;Extension &quot;+ cMessageExtensionUninstall, IsNull (oTestExtension) )
+-
+-    Print #LocalTestLog, &quot;---&quot;
+-    Close #LocalTestLog%
+-    LocalTestLog = 0
+-    Exit Sub &apos; Without error
+-
+-    EXTERROR:
+-    If ( gCurrentTestCase = cLogfileFailed ) then
+-        LogTestResult( &quot; &quot;, False )
+-        Exit Sub
+-    else
+-        LogTestResult( &quot;Extension &quot;+ sCurrentMessage, False )
+-        Close #LocalTestLog%
+-        LocalTestLog = 0
+-    End If
+-    Exit Sub &apos; With error
+-
+ End Sub
+ </script:module>
diff --git a/rules b/rules
index d892b89..d6ecdb2 100755
--- a/rules
+++ b/rules
@@ -359,14 +359,16 @@ OOO_GCJ_JDK_ARCHS := hppa kfreebsd-i386 kfreebsd-amd64
 OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
 $(eval $(call gen_no_archs,OOO_OPENJDK_ARCHS))
 
-OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
+OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(filter-out s390 s390x,$(OOO_ARCHS))
+OOO_EXTENSIONS_ARCHS := $(OOO_ARCH_DEP_EXTENSIONS_ARCHS)
 
-OOO_BASE_ARCHS := $(filter-out armel powerpc powerpcspe ppc64,$(OOO_JAVA_ARCHS))
+OOO_BASE_ARCHS := $(filter-out armel powerpc powerpcspe ppc64 s390x,$(OOO_JAVA_ARCHS))
 $(eval $(call gen_no_archs,OOO_BASE_ARCHS))
 OOO_REPORTDESIGN_ARCHS := $(filter-out armel $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
 $(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
 
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
+  ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_BASE_ARCHS)))
 	PACKAGE_BASE=n
 	ENABLE_SDBC_POSTGRESQL=n
 	ENABLE_MYSQLNATIVE=n
@@ -377,6 +379,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
 	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-evolution -Nlibreoffice$(VER)-kab
 	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-sdbc-postgresql -Nlibreoffice$(VER)-mysql-connector
 	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
+  endif
 endif
 
 ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
@@ -385,6 +388,16 @@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
 	ENABLE_PRESENTER_CONSOLE=n
 	ENABLE_SDBC_POSTGRESQL=n
 	ENABLE_MYSQLNATIVE=n
+	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-mysql-connector
+	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
+	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-pdfimport -Nlibreoffice$(VER)-presentation-minimizer
+	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-presenter-console
+endif
+ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
+	ENABLE_MEDIAWIKI=n
+	ENABLE_REPORTDESIGN=n
+	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
+	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-wiki-publisher
 endif
 
 ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
@@ -418,7 +431,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
 endif
 
 ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
-OOO_NPSOPLUGIN_ARCHS = $(OOO_ARCHS)
+OOO_NPSOPLUGIN_ARCHS = $(filter-out s390x,$(OOO_ARCHS))
 else
 OOO_NPSOPLUGIN_ARCHS=
 endif
@@ -429,6 +442,11 @@ ifneq (,$(filter arm% mips% m68k, $(DEB_HOST_ARCH)))
 endif
 OOO_BINFILTER_ARCHS:=$(filter-out arm% mips% m68k, $(OOO_ARCHS))
 
+ifeq (s390x,$(findstring s390x,$(DEB_HOST_ARCH)))
+	ENABLE_EVO2=n
+	SYSTEM_STUFF := $(filter-out mozilla-headers, $(SYSTEM_STUFF))
+endif
+
 #############
 # Distro-specific overrides
 
@@ -1601,6 +1619,10 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
 	cd $(SOURCE_TREE)/smoketest && \
 		patch -p1 < $(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
 endif
+ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSION_ARCHS)))
+	cd $(SOURCE_TREE)/smoketest && \
+		patch -p1 < $(CURDIR)/debian/patches/smoketest-disable-extension-tests.diff
+endif
 
 	t=`mktemp -q -d`; \
 	cd $(SOURCE_TREE) && \
@@ -1615,6 +1637,10 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
 	cd $(SOURCE_TREE)/smoketest && \
 		patch -p1 -R < $(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
 endif
+ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSION_ARCHS)))
+	cd $(SOURCE_TREE)/smoketest && \
+		patch -p1 -R < $(CURDIR)/debian/patches/smoketest-disable-extension-tests.diff
+endif
 endif
 
 install: $(STAMP_DIR)/install

-- 
LibreOffice packaging repository
Reply to: