diff -Nru libreoffice-6.3.4/debian/changelog libreoffice-6.3.4/debian/changelog --- libreoffice-6.3.4/debian/changelog 2019-12-12 21:52:05.000000000 +0000 +++ libreoffice-6.3.4/debian/changelog 2019-12-16 16:05:00.000000000 +0000 @@ -1,3 +1,13 @@ +libreoffice (1:6.3.4-2+rpi1) bullseye-staging; urgency=medium + + [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green] + * Disable pdfium, it fails to build for armv6 + + [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green at Fri, 27 Apr 2018 02:14:18 +0000] + * Disable testsuite. + + -- Raspbian forward porter Mon, 16 Dec 2019 16:05:00 +0000 + libreoffice (1:6.3.4-2) unstable; urgency=medium * reupload with full languages in control... diff -Nru libreoffice-6.3.4/debian/control libreoffice-6.3.4/debian/control --- libreoffice-6.3.4/debian/control 2019-12-12 21:43:50.000000000 +0000 +++ libreoffice-6.3.4/debian/control 2019-12-16 16:05:00.000000000 +0000 @@ -32,18 +32,14 @@ g++ (>= 4:7), gcc (>= 4:7), gdb [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - ghostscript [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , gobject-introspection (>= 1.32.0), gperf (>= 3.1), gpg , gpg-agent , gpgconf , - hunspell-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , hyphen-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - imagemagick [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , java-common (>= 0.61), javahelper (>= 0.37~), - junit4 (>= 4.8.2-2) [amd64 arm64] , libabw-dev (>= 0.1), libarchive-zip-perl [!hppa !mips64 !s390 !sparc], libavahi-client-dev, @@ -60,7 +56,6 @@ libclucene-dev (>= 2.3.3.4-4.1), libcmis-dev (>= 0.5.2~), libcommons-logging-java [!hppa !mips64 !s390 !sparc], - libcppunit-dev (>= 1.14) [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , libcups2-dev, libcurl4-gnutls-dev, libdbus-1-dev (>= 0.60), @@ -167,11 +162,9 @@ lp-solve (>= 5.5.0.13-5+b1), maven-repo-helper, pkg-config, - pstoedit [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , python3, python3-dev (>= 3.3) , python3-distutils , - python3-lxml , qt5-qmake (>= 5.6), qtbase5-dev (>= 5.6), qtbase5-dev-tools (>= 5.6), @@ -186,14 +179,12 @@ Build-Depends-Indep: ant (>= 1.7.0) [!hppa !mips64 !s390 !sparc], ant-optional (>= 1.7.0) [!hppa !mips64 !s390 !sparc], doxygen (>= 1.8.4) , - g++-mingw-w64-i686, gettext, graphviz , libbsh-java, rdfind, symlinks Build-Conflicts: amd-libopencl1, - fonts-opensymbol , g++-9 (= 9.2.1-12) , g++-9 (= 9.2.1-13) , g++-9 (= 9.2.1-14) , diff -Nru libreoffice-6.3.4/debian/rules libreoffice-6.3.4/debian/rules --- libreoffice-6.3.4/debian/rules 2019-12-04 19:56:42.000000000 +0000 +++ libreoffice-6.3.4/debian/rules 2019-12-16 16:05:00.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 @@ -466,7 +468,7 @@ # let's do this only on archs where we have chromium, which is supposedly even only the archs # where alsp pdfium is supported. -OOO_PDFIUM_ARCHS := i386 amd64 armhf arm64 +OOO_PDFIUM_ARCHS := i386 amd64 arm64 ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS))) ENABLE_PDFIUM=y else