diff -Nru libreoffice-6.1.3~rc1/debian/changelog libreoffice-6.1.3~rc1/debian/changelog
--- libreoffice-6.1.3~rc1/debian/changelog 2018-10-10 21:25:32.000000000 +0000
+++ libreoffice-6.1.3~rc1/debian/changelog 2018-10-18 12:57:22.000000000 +0000
@@ -1,3 +1,16 @@
+libreoffice (1:6.1.3~rc1-1+rpi1) buster-staging; urgency=medium
+
+ [changes brought forward from 1:5.2.4-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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 <plugwash@raspbian.org> at Fri, 27 Apr 2018 02:14:18 +0000]
+ * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org> Thu, 18 Oct 2018 12:57:22 +0000
+
libreoffice (1:6.1.3~rc1-1) unstable; urgency=medium
* New upstream release candidate
diff -Nru libreoffice-6.1.3~rc1/debian/control libreoffice-6.1.3~rc1/debian/control
--- libreoffice-6.1.3~rc1/debian/control 2018-10-10 21:25:32.000000000 +0000
+++ libreoffice-6.1.3~rc1/debian/control 2018-10-18 12:57:22.000000000 +0000
@@ -10,7 +10,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),
@@ -34,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] <!nocheck>,
- ghostscript [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
gobject-introspection (>= 1.32.0),
gperf,
gpg <!nocheck>,
gpg-agent <!nocheck>,
gpgconf <!nocheck>,
- hunspell-en-us [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
- imagemagick [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
java-common (>= 0.61),
javahelper (>= 0.37~),
- junit4 (>= 4.8.2-2) [amd64 arm64] <!nocheck>,
libabw-dev (>= 0.1),
libarchive-zip-perl [!hppa !mips64 !s390 !sparc],
libavahi-client-dev,
@@ -63,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] <!nocheck>,
libcups2-dev,
libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
@@ -172,11 +166,9 @@
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] <!nocheck>,
python3,
python3-dev (>= 3.3),
python3-distutils,
- python3-lxml <!nocheck>,
qt5-qmake (>= 5.6),
qtbase5-dev (>= 5.6),
qtbase5-dev-tools (>= 5.6),
@@ -191,19 +183,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) <!nodoc>,
- g++-mingw-w64-i686,
gettext,
graphviz <!nodoc>,
libbsh-java,
rdfind,
symlinks
Build-Conflicts: amd-libopencl1,
- fonts-liberation (= 1:1.07.4-3) <!nocheck>,
- fonts-liberation (= 1:1.07.4-4) <!nocheck>,
- fonts-liberation (= 1:1.07.4-5) <!nocheck>,
- fonts-liberation2 (= 2.00.1-4) <!nocheck>,
- fonts-liberation2 (= 2.00.1-5) <!nocheck>,
- fonts-opensymbol <!nocheck>,
nvidia-glx-dev,
nvidia-glx-legacy-dev,
nvidia-libopencl1
diff -Nru libreoffice-6.1.3~rc1/debian/rules libreoffice-6.1.3~rc1/debian/rules
--- libreoffice-6.1.3~rc1/debian/rules 2018-10-10 21:25:32.000000000 +0000
+++ libreoffice-6.1.3~rc1/debian/rules 2018-10-18 12:57:21.000000000 +0000
@@ -15,6 +15,8 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
################################################################################
+export DEB_BUILD_OPTIONS += nocheck
+
vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
include /usr/share/dpkg/pkg-info.mk
@@ -514,7 +516,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
@@ -570,7 +572,7 @@
OOO_FIREBIRD_ARCHS := $(OOO_LE_ARCHS)
$(eval $(call gen_no_archs,OOO_FIREBIRD_ARCHS))
# chromium only available here.
-OOO_GDRIVE_ARCHS=amd64 arm64 armhf i386
+OOO_GDRIVE_ARCHS=amd64 arm64 i386
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_BASE_ARCHS)))