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

diff --cc debian/changelog
index 62f02bae45e5b8274352df81eb268d5462230158,3ef02d185ddd1834cd5544219093b42b974c531e..f2ba155e0c3fbb338b20dc46ec54c6e6fb8b4ad9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- abiword (3.0.2-9+rpi1) bullseye-staging; urgency=medium
++abiword (3.0.2-10+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 09 Oct 2019 01:36:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Apr 2020 11:52:55 +0000
++
+ abiword (3.0.2-10) unstable; urgency=medium
+ 
+   * QA upload.
+   * debian/patches/git_build_fix:
+     - cherry pick a build fix for newer toolchain
+ 
+  -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 02 Apr 2020 14:46:29 +0200
  
  abiword (3.0.2-9) unstable; urgency=medium