diff -Nru libreoffice-5.4.4/debian/changelog libreoffice-5.4.4/debian/changelog --- libreoffice-5.4.4/debian/changelog 2017-12-14 23:29:20.000000000 +0000 +++ libreoffice-5.4.4/debian/changelog 2017-12-31 14:02:24.000000000 +0000 @@ -1,3 +1,13 @@ +libreoffice (1:5.4.4-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 Sun, 31 Dec 2017 14:02:24 +0000 + libreoffice (1:5.4.4-1) unstable; urgency=medium [ Rene Engelhard ] diff -Nru libreoffice-5.4.4/debian/control libreoffice-5.4.4/debian/control --- libreoffice-5.4.4/debian/control 2017-12-14 23:29:20.000000000 +0000 +++ libreoffice-5.4.4/debian/control 2017-12-31 14:02:24.000000000 +0000 @@ -11,7 +11,6 @@ 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), @@ -40,7 +39,6 @@ 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], libavahi-client-dev, @@ -115,7 +113,6 @@ libneon27-gnutls-dev, libnspr4-dev, libnss3-dev (>= 3.12.3), - libo3dgc-dev (>= 0~20131011-2) [amd64 i386], libodfgen-dev (>= 0.1), liborcus-dev (>= 0.12), libpagemaker-dev, @@ -166,7 +163,6 @@ pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , python3, python3-dev (>= 3.3), - rapidjson-dev [amd64 i386], ucpp, unixodbc-dev (>= 2.2.11), unzip, diff -Nru libreoffice-5.4.4/debian/rules libreoffice-5.4.4/debian/rules --- libreoffice-5.4.4/debian/rules 2017-12-14 23:29:20.000000000 +0000 +++ libreoffice-5.4.4/debian/rules 2017-12-31 14:02:24.000000000 +0000 @@ -582,7 +582,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 (,$(findstring $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS))) ENABLE_PDFIUM=y else