diff -Nru libreoffice-6.0.5/debian/changelog libreoffice-6.0.5/debian/changelog --- libreoffice-6.0.5/debian/changelog 2018-06-20 04:54:34.000000000 +0000 +++ libreoffice-6.0.5/debian/changelog 2018-06-26 23:10:17.000000000 +0000 @@ -1,3 +1,16 @@ +libreoffice (1:6.0.5-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 + + [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 Tue, 26 Jun 2018 23:10:17 +0000 + libreoffice (1:6.0.5-1) unstable; urgency=medium * New upstream release diff -Nru libreoffice-6.0.5/debian/control libreoffice-6.0.5/debian/control --- libreoffice-6.0.5/debian/control 2018-06-20 04:54:34.000000000 +0000 +++ libreoffice-6.0.5/debian/control 2018-06-26 23:10:17.000000000 +0000 @@ -11,11 +11,9 @@ 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], @@ -25,7 +23,6 @@ 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), @@ -36,17 +33,13 @@ 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 , gpg-agent , gpgconf , - 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) [amd64 arm64] , libabw-dev (>= 0.1), libarchive-zip-perl [!hppa !mips64 !s390 !sparc], libavahi-client-dev, @@ -65,7 +58,6 @@ libclucene-dev (>= 2.3.3.4-4.1), libcmis-dev (>= 0.5.0-3), libcommons-logging-java [!hppa !mips64 !s390 !sparc], - libcppunit-dev (>= 1.14) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , libcups2-dev, libcurl4-gnutls-dev, libdbus-glib-1-dev (>= 0.70), @@ -165,7 +157,6 @@ lp-solve (>= 5.5.0.13-5+b1), maven-repo-helper, pkg-config, - pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , python3, python3-dev (>= 3.3), python3-distutils, @@ -177,17 +168,11 @@ zip, zlib1g-dev Build-Depends-Indep: doxygen (>= 1.8.4) , - g++-mingw-w64-i686, gettext, libbsh-java, rdfind, symlinks Build-Conflicts: amd-libopencl1, - fonts-liberation (= 1:1.07.4-3) , - fonts-liberation (= 1:1.07.4-4) , - fonts-liberation (= 1:1.07.4-5) , - fonts-liberation2 (= 2.00.1-4) , - fonts-liberation2 (= 2.00.1-5) , g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), g++-4.7 (<< 4.7.1-3), diff -Nru libreoffice-6.0.5/debian/rules libreoffice-6.0.5/debian/rules --- libreoffice-6.0.5/debian/rules 2018-06-18 15:51:49.000000000 +0000 +++ libreoffice-6.0.5/debian/rules 2018-06-26 23:10:16.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 @@ -487,7 +489,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