From: Peter Michael Green <plugwash@raspbian.org>
Date: Sat, 28 Jul 2018 11:25:06 +0000 (+0100)
Subject: Manual merge of version 1:6.0.6~rc1-1+rpi1 and 1:6.1.0~rc2-3 to produce 1:6.1.0~rc2... 
X-Git-Tag: archive/raspbian/1%6.1.0_rc2-3+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3e97d811fc04e46856dfd5f4ec584ce07010ff6b;p=libreoffice.git

Manual merge of version 1:6.0.6~rc1-1+rpi1 and 1:6.1.0~rc2-3 to produce 1:6.1.0~rc2-3+rpi1
---

3e97d811fc04e46856dfd5f4ec584ce07010ff6b
diff --cc debian/changelog
index 3a7793a0913,1eebed08e6b..8f020e7cdd0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,19 +1,32 @@@
- libreoffice (1:6.0.6~rc1-1+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.1.0~rc2-3+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>  Sun, 15 Jul 2018 15:05:13 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 27 Jul 2018 00:18:25 +0000
 +
- libreoffice (1:6.0.6~rc1-1) unstable; urgency=medium
+ libreoffice (1:6.1.0~rc2-3) unstable; urgency=medium
+ 
+   * debian/tests/control:
+     - "timeout" is in coreutils...
+   * debian/rules:
+     - add | firefox at the end of the -help browser depends (closes: #904312)
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 23 Jul 2018 18:54:04 +0000
+ 
+ libreoffice (1:6.1.0~rc2-2) unstable; urgency=low
+ 
+   * upload to unstable
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 21 Jul 2018 23:52:12 +0000
+ 
+ libreoffice (1:6.1.0~rc2-1) experimental; urgency=low
  
    * New upstream release candidate
  
diff --cc debian/control
index 1116bf0a5ca,dbf3bf88e10..e93a0ce5c7c
--- a/debian/control
+++ b/debian/control
@@@ -38,8 -40,11 +38,8 @@@ Build-Depends: apparmor <!nocheck>
                 gpg <!nocheck>,
                 gpg-agent <!nocheck>,
                 gpgconf <!nocheck>,
-                java-common (>= 0.49),
 -               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,
@@@ -167,15 -188,22 +181,16 @@@
                 xsltproc,
                 zip,
                 zlib1g-dev
- Build-Depends-Indep: doxygen (>= 1.8.4) <!nodoc>,
+ 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,
-                  g++-4.6 (= 4.6.1-10),
-                  g++-4.6 (= 4.6.1-11),
-                  g++-4.7 (<< 4.7.1-3),
 -                 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 --cc debian/rules
index e9778af852d,f9f8b4315e5..363a396d4ef
--- a/debian/rules
+++ b/debian/rules
@@@ -550,7 -568,7 +570,7 @@@ $(eval $(call gen_no_archs,OOO_REPORTBU
  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)))