Merge version 3.0.4~dfsg-1+rpi1 and 3.0.4~dfsg-2 to produce 3.0.4~dfsg-2+rpi1

diff --cc debian/changelog
index 4b4cc592d4af30f54373c94b6a713989eb67e53e,9e6c7644f783d8e66e75a0d5823b1c13bc77f858..e4f700ba614788c2039d56db77fd906d1b7c0549
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,19 @@@
- abiword (3.0.4~dfsg-1+rpi1) bullseye-staging; urgency=medium
++abiword (3.0.4~dfsg-2+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>  Thu, 11 Jun 2020 12:07:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jun 2020 17:38:10 +0000
++
+ abiword (3.0.4~dfsg-2) unstable; urgency=medium
+ 
+   * fix typo in changelog
+   * fix have libabiword-dev depend on libenchant-2-dev
+     (not libenchant-dev);
+     really closes: bug#956710, thanks to Laurent Bigonville
+ 
+  -- Jonas Smedegaard <dr@jones.dk>  Sat, 13 Jun 2020 12:56:47 +0200
  
  abiword (3.0.4~dfsg-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge