Manual merge of version 1:6.0.0-1+rpi1 and 1:6.0.2-1 to produce 1:6.0.2-1+rpi1

diff --cc debian/changelog
index df1771be41d388bb113e83a329d7e7fd1d81faf3,e6a73f1b27036ced320da1176b66a1845169dd7e..de78881c10949b33d2189481b7f590a6d7bbdcfd
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,49 +1,59 @@@
- libreoffice (1:6.0.0-1+rpi1) buster-staging; urgency=medium
++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 <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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Feb 2018 05:25:22 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 13 Mar 2018 02:30:18 +0000
++
+ libreoffice (1:6.0.2-1) unstable; urgency=medium
+ 
+   [ Rene Engelhard ]
+   * New upstream release
+ 
+   * debian/patches/orcus-0.13.3.diff: backport patches to fix build/tests
+     against orcus 0.13.3
+   * debian/patches/disable-some-sc-tests-with-internal-cppunit.diff: update
+ 
+   * debian/watch: update for the multiple tarballs
+   * debian/copyright: remove Files-Excluded: for files already removed by
+     upstreams pack script anyway to allow mk-origtargz doing --symlink
+   * debian/scripts/mk-origtargz: own mk-origtargz..
+ 
+   * debian/rules:
+     - --disable-pdfium on arm64
+     - actually build without -g if ENABLE_SYMBOLS=n
+     - add get-orig-source target for "real" upstream tarballs
+     - fix libvisio dependency
+     - bump runtime (and test) depends for liborcus to >= 0.13.3
+   * debian/control.in:
+     - recommend xdg-utils in -common (for xdg-{open,email})
+ 
+   [ Olivier Tilloy ]
+   * debian/rules: define ${java-common-depends} when building
+     libreoffice-wiki-publisher and libreoffice-nlpsolver (closes: #891765)
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 28 Feb 2018 18:37:57 +0100
+ 
+ libreoffice (1:6.0.1-1) unstable; urgency=high
+ 
+   * New upstream release
+     - fixes CVE-2018-1055: libreoffice: Remote arbitrary file disclosure
+       vulnerability via WEBSERVICE formula
+ 
+   * debian/control.in: bump ure Depends for -core to (>= 6.0.0~)
+     (closes: #889074)
+   * debian/rules:
+     - use internal mdds for stretch-backports
+   * debian/tests/control: make uicheck depend on libreoffice-l10n-{he,ja}
+     for the text direction UI Test
+ 
+   * merge from Ubuntu:
+     - Bump shlibs overrides for libvisio and orcus
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 08 Feb 2018 19:29:39 +0100
  
  libreoffice (1:6.0.0-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
index 7d8f1f25c1316cf619cfdd78a0bbd14605035058,3963fd63dbf7800833e157e3fbb21a7885d064cf..88e84c763364c8c7c2c026e284f838c6b107b593
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -577,8 -579,9 +579,9 @@@ PLATFORMID := $(shell grep PLATFORMID d
  
  
  # 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 arm64
+ # 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