Merge version 3.0.2-8+rpi1 and 3.0.2-9 to produce 3.0.2-9+rpi1

diff --cc debian/changelog
index 32fe1f73c10dfca58d178277ddcb2c389a55986b,cefb4e27dfa8889fbfd1e240b246699144480e3e..62f02bae45e5b8274352df81eb268d5462230158
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,19 @@@
- abiword (3.0.2-8+rpi1) bullseye-staging; urgency=medium
++abiword (3.0.2-9+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 3.0.2-8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 26 Jul 2019 19:02:13 +0000]
 +  * Move valgrind from build-depends to build-conflicts, raspbians valgrind
 +    is problematic.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 26 Jul 2019 19:02:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 09 Oct 2019 01:36:43 +0000
++
+ abiword (3.0.2-9) unstable; urgency=medium
+ 
+   * QA upload.
+   * build-Don-t-check-for-libecal.patch: Drop libecal BD. There's an API break
+     coming up, and we can get abiword out of the transition by dropping it.
+     It's not used.
+ 
+  -- Iain Lane <laney@debian.org>  Wed, 14 Aug 2019 09:40:20 +0100
  
  abiword (3.0.2-8) unstable; urgency=medium
  

diff --cc debian/control
Simple merge