diff -Nru libreoffice-6.0.2/debian/changelog libreoffice-6.0.2/debian/changelog --- libreoffice-6.0.2/debian/changelog 2018-02-28 17:37:57.000000000 +0000 +++ libreoffice-6.0.2/debian/changelog 2018-04-27 02:14:18.000000000 +0000 @@ -1,3 +1,19 @@ +libreoffice (1:6.0.2-1+rpi2) buster-staging; urgency=medium + + * Disable testsuite. + + -- Peter Michael Green Fri, 27 Apr 2018 02:14:18 +0000 + +libreoffice (1:6.0.2-1+rpi1) buster-staging; urgency=medium + + [changes brought forward from 1:5.2.4-2+rpi1 by Peter Michael Green at Sat, 07 Jan 2017 01:42:16 +0000] + * Disable chromium stuff as we don't currently have chromium in the Raspbian + repository. + [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green] + * Disable pdfium, it fails to build for armv6 + + -- Peter Michael Green Tue, 13 Mar 2018 02:30:18 +0000 + libreoffice (1:6.0.2-1) unstable; urgency=medium [ Rene Engelhard ] diff -Nru libreoffice-6.0.2/debian/control libreoffice-6.0.2/debian/control --- libreoffice-6.0.2/debian/control 2018-02-28 17:37:57.000000000 +0000 +++ libreoffice-6.0.2/debian/control 2018-04-27 02:14:18.000000000 +0000 @@ -3,27 +3,25 @@ Priority: optional Maintainer: Debian LibreOffice Maintainers Uploaders: Rene Engelhard , Chris Halls -Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc], - ant-optional (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc], +Build-Depends: ant (>= 1.7.0) [!hppa !mips64 !s390 !sparc], + ant-optional (>= 1.7.0) [!hppa !mips64 !s390 !sparc], autoconf, automake, bc, binutils (>= 2.23) [mips mipsel], bison, bzip2, - chromium [amd64 arm64 armhf i386], coinor-libcoinmp-dev (>= 1.8.3-2), coinor-libcoinutils-dev (>= 2.10.14+repack1-1), debhelper (>= 10), - debhelper (>= 10.10.4), default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc !i386], + default-jdk (>= 1:1.7-48) [ia64], default-jdk (>= 2:1.7-52.1) [kfreebsd-any], default-jdk (>= 2:1.8-55) [sparc64], default-libmysqlclient-dev, dh-apparmor, dh-python, dpkg-dev (>= 1.18.2~), - dwz, firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64], firebird3.0-server-core [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , flex (>= 2.3.35), @@ -34,19 +32,15 @@ g++ (>= 4:7) [m68k], gcc (>= 4:7) [m68k], gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , - ghostscript [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , gobject-introspection (>= 1.32.0), gperf, gpg , - hunspell-en-us [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , - imagemagick [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , java-common (>= 0.49), javahelper (>= 0.37~), - junit4 (>= 4.8.2-2) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , libabw-dev (>= 0.1), - libarchive-zip-perl [!hppa !ia64 !mips64 !s390 !sparc], + libarchive-zip-perl [!hppa !mips64 !s390 !sparc], libavahi-client-dev, - libbase-java [!hppa !ia64 !mips64 !s390 !sparc], + libbase-java [!hppa !mips64 !s390 !sparc], libbluetooth-dev [linux-any], libboost-date-time-dev (>= 1.58), libboost-dev (>= 1.58), @@ -60,8 +54,7 @@ libcdr-dev (>= 0.1), libclucene-dev (>= 2.3.3.4-4.1), libcmis-dev (>= 0.5.0-3), - libcommons-logging-java [!hppa !ia64 !mips64 !s390 !sparc], - libcppunit-dev (>= 1.14) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , + libcommons-logging-java [!hppa !mips64 !s390 !sparc], libcups2-dev, libcurl4-gnutls-dev, libdbus-glib-1-dev (>= 0.70), @@ -76,10 +69,10 @@ libetonyek-dev (>= 0.1.5) , libexpat1-dev, libexttextcat-dev (>= 3.4.1), - libflute-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc], + libflute-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc], libfontconfig1-dev, - libfonts-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc], - libformula-java (>= 1.1.7) [!hppa !ia64 !mips64 !s390 !sparc], + libfonts-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc], + libformula-java (>= 1.1.7) [!hppa !mips64 !s390 !sparc], libfreehand-dev (>= 0.1), libfreetype6-dev (>= 2.2.0), libgirepository1.0-dev (>= 1.32), @@ -95,17 +88,17 @@ libgtk-3-dev (>= 3.8.0), libgtk2.0-dev (>= 2.18.0), libharfbuzz-dev (>= 0.9.42), - libhsqldb1.8.0-java (>> 1.8.0.10) [!hppa !ia64 !mips64 !s390 !sparc], + libhsqldb1.8.0-java (>> 1.8.0.10) [!hppa !mips64 !s390 !sparc], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libice-dev, libicu-dev (>= 52), libjpeg-dev, liblangtag-dev (>= 0.4), - liblayout-java (>= 0.2.10) [!hppa !ia64 !mips64 !s390 !sparc], + liblayout-java (>= 0.2.10) [!hppa !mips64 !s390 !sparc], liblcms2-dev, libldap2-dev, - libloader-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc], + libloader-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc], liblpsolve55-dev (>= 5.5.0.13-5+b1), libmdds-dev (>= 1.2.3), libmspub-dev (>= 0.1), @@ -119,7 +112,7 @@ libodfgen-dev (>= 0.1), liborcus-dev (>= 0.13.3), libpagemaker-dev, - libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !ia64 !mips64 !s390 !sparc], + libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !mips64 !s390 !sparc], libpng-dev, libpoppler-cpp-dev, libpoppler-dev (>= 0.12.0), @@ -127,11 +120,11 @@ libpq-dev (>= 9.0~), libqxp-dev, librdf0-dev (>= 1.0.16-2), - librepository-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc], + librepository-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc], librevenge-dev, - libsac-java [!hppa !ia64 !mips64 !s390 !sparc], + libsac-java [!hppa !mips64 !s390 !sparc], libsane-dev, - libserializer-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc], + libserializer-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc], libsm-dev, libstaroffice-dev, libstaroffice-dev (>= 0.0.3) , @@ -147,7 +140,7 @@ libxext-dev, libxinerama-dev, libxkbfile-dev, - libxml-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc], + libxml-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc], libxml2-dev (>= 2.8), libxml2-utils, libxmlsec1-dev (>= 1.2.24), @@ -162,7 +155,6 @@ maven-repo-helper, openjdk-9-jdk (>= 9.0.1+11-1~) [i386], pkg-config, - pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , python3, python3-dev (>= 3.3), ucpp, @@ -173,7 +165,6 @@ zip, zlib1g-dev Build-Depends-Indep: doxygen (>= 1.8.4) , - g++-mingw-w64-i686, gettext, libbsh-java, rdfind, @@ -194,13 +185,13 @@ Package: libreoffice Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64 Section: metapackages -Depends: libreoffice-base [!hppa !ia64 !mips64 !s390 !sparc], +Depends: libreoffice-base [!hppa !mips64 !s390 !sparc], libreoffice-calc, libreoffice-core (= ${binary:Version}), libreoffice-draw, libreoffice-impress, libreoffice-math, - libreoffice-report-builder-bin [!hppa !ia64 !mips64 !s390 !sparc], + libreoffice-report-builder-bin [!hppa !mips64 !s390 !sparc], libreoffice-writer, ${avmedia-be-depends}, ${misc:Depends}, @@ -217,7 +208,7 @@ libreoffice-librelogo, libreoffice-nlpsolver, libreoffice-ogltrans, - libreoffice-report-builder [!hppa !ia64 !mips64 !s390 !sparc], + libreoffice-report-builder [!hppa !mips64 !s390 !sparc], libreoffice-script-provider-bsh, libreoffice-script-provider-js, libreoffice-script-provider-python, @@ -419,7 +410,7 @@ Package: libreoffice-writer Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64 -Depends: libreoffice-base-core (= ${binary:Version}) [!hppa !ia64 !mips64 !s390 !sparc], +Depends: libreoffice-base-core (= ${binary:Version}) [!hppa !mips64 !s390 !sparc], libreoffice-core (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -439,7 +430,7 @@ Package: libreoffice-calc Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64 -Depends: libreoffice-base-core (= ${binary:Version}) [!hppa !ia64 !mips64 !s390 !sparc], +Depends: libreoffice-base-core (= ${binary:Version}) [!hppa !mips64 !s390 !sparc], libreoffice-core (= ${binary:Version}), ${lpsolve-dep}, ${misc:Depends}, @@ -495,7 +486,7 @@ This package contains the equation editor component for LibreOffice. Package: libreoffice-base-core -Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 arm64 armel armhf i386 ia64 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 Depends: libreoffice-core (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -511,7 +502,7 @@ install libreoffice-base. Package: libreoffice-base -Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 arm64 armel armhf i386 ia64 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 Section: database Depends: libreoffice-base-core (= ${binary:Version}), libreoffice-base-drivers (= ${binary:Version}), @@ -646,7 +637,7 @@ Homepage: http://udk.openoffice.org/python/python-bridge.html Package: libreoffice-officebean -Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 arm64 armel armhf i386 ia64 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 Section: java Depends: libreoffice-core (= ${binary:Version}), ${java-common-depends}, @@ -752,7 +743,7 @@ ${java:Depends}, ${misc:Depends}, ${shlibs:Depends} -Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 arm64 armel armhf i386 ia64 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 Section: database Enhances: libreoffice-base-drivers Description: HSQLDB SDBC driver for LibreOffice @@ -764,13 +755,13 @@ Package: libreoffice-base-drivers Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends} -Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 arm64 armel armhf i386 ia64 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 Section: database Suggests: libjtds-java, libreoffice-mysql-connector | libmyodbc | libmysql-java, libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java, libsqliteodbc | tdsodbc | mdbtools -Recommends: libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386], +Recommends: libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 ia64 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386], ${base-firebird-recommends} Replaces: libreoffice-base (<< 1:4.3.0-3) Breaks: libreoffice-base (<< 1:4.3.0-3) @@ -4066,7 +4057,7 @@ Package: libreoffice-report-builder-bin Section: misc -Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 arm64 armel armhf i386 ia64 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 Depends: libreoffice-base, libreoffice-core, ${misc:Depends}, ${shlibs:Depends} Description: LibreOffice component for building database reports -- libraries LibreOffice is a full-featured office productivity suite that provides @@ -4257,7 +4248,7 @@ Package: libreoffice-sdbc-postgresql Section: misc -Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 arm64 armel armhf i386 ia64 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends} Suggests: postgresql (>= 8.4) Enhances: libreoffice-base-drivers @@ -4271,7 +4262,7 @@ Package: libreoffice-mysql-connector Section: misc -Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 arm64 armel armhf i386 ia64 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends} Suggests: default-mysql-server | virtual-mysql-server Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector @@ -4283,7 +4274,7 @@ database from LibreOffice without any wrapper layer such as ODBC or JDBC. Package: libreoffice-evolution -Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 arm64 armel armhf i386 ia64 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 Section: gnome Depends: libreoffice-base, libreoffice-common, diff -Nru libreoffice-6.0.2/debian/rules libreoffice-6.0.2/debian/rules --- libreoffice-6.0.2/debian/rules 2018-02-28 17:37:48.000000000 +0000 +++ libreoffice-6.0.2/debian/rules 2018-04-27 02:12:06.000000000 +0000 @@ -15,6 +15,8 @@ # /usr/share/common-licenses/GPL or . ################################################################################ +export DEB_BUILD_OPTIONS += nocheck + vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1))) include /usr/share/dpkg/pkg-info.mk @@ -581,7 +583,7 @@ # let's do this only on archs where we have chromium, which is supposedly even only the archs # where alsp pdfium is supported. Remove arm64, see https://lists.freedesktop.org/archives/libreoffice/2018-February/079384.html -OOO_PDFIUM_ARCHS := i386 amd64 armhf +OOO_PDFIUM_ARCHS := i386 amd64 ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS))) ENABLE_PDFIUM=y else