Merge version 1:6.1.0~rc2-3+rpi1 and 1:6.1.1~rc1-1 to produce 1:6.1.1~rc1-1+rpi1

diff --cc debian/changelog
index 8f020e7cdd0f34812a994ee0a7249ee9aa8ed7ef,62d1762a012e1abba082c4295fefd9132f01f406..bc61ca7976838b117bf29aee026dc6d7537729d1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,52 +1,65 @@@
- libreoffice (1:6.1.0~rc2-3+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.1.1~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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 27 Jul 2018 00:18:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 01 Sep 2018 21:14:53 +0000
++
+ libreoffice (1:6.1.1~rc1-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/apparmor-kde.diff: backport AppArmor KDE fixes from
+     master
+   * debian/control.in:
+     - *really* recommend apparmor (>= 2.13)
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 24 Aug 2018 18:57:08 +0200
+ 
+ libreoffice (1:6.1.0-1) unstable; urgency=medium
+ 
+   * Libreoffice 6.1.0 final (identical to rc3)
+ 
+   * debian/patches/apparmor-fixes.diff: add patch from libreoffice-6-1
+     branch to fix saving of documents in apparmor enforce mode
+     (closes: #905442)
+   * debian/patches/apparmor-cleanups.diff: use dri-enumerate abstraction of
+     apparmor; add from https://gerrit.libreoffice.org/#/c/58589
+ 
+   * debian/control.in:
+     - recommend apparmor (>= 2.13) for above
+     - make -common also depend on -style-colibre, since it apparently also
+       is needed to have LO draw iit's check/radiobuttons correctly
+       (closes: #904598, #905408, #905819)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 12 Aug 2018 08:13:03 +0200
+ 
+ libreoffice (1:6.1.0~rc3-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/do-not-hide-test-output.diff: also do not hide PythonTests
+     output
+ 
+   * debian/control.in: add Breaks/Replaces: libreoffice-common (<<
+     1:6.1.0~alpha1-1) to libreoffice-help-common (closes: #905185)
+   * debian/tests/control, debian/tests/smoketest: use "skippable" restriction
+     and return 77 instead of 0 if running into the timeout
+   * debian/tests/*: use $AUTOPKGTEST_TMP instead of $ADTTMP
+   * debian/rules:
+     - don't suggest libreoffice-spellcheck-tr (for
+       libreoffice-zemberek) anymore - dead upstream. thanks Muhammet Kara 
+     - support new "terse" in DEB_BUILD_OPTIONS
+     - replace #!/usr/bin/env perl shebangs in some files by #!/usr/bin/perl
+     - also fix up ../00/usr/share/libreoffice/help/... in doc-base....
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 02 Aug 2018 21:06:53 +0000
  
  libreoffice (1:6.1.0~rc2-3) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge