diff -Nru abiword-3.0.4~dfsg/debian/changelog abiword-3.0.4~dfsg/debian/changelog
--- abiword-3.0.4~dfsg/debian/changelog	2020-06-13 10:56:47.000000000 +0000
+++ abiword-3.0.4~dfsg/debian/changelog	2020-06-18 17:38:10.000000000 +0000
@@ -1,3 +1,11 @@
+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, 18 Jun 2020 17:38:10 +0000
+
 abiword (3.0.4~dfsg-2) unstable; urgency=medium
 
   * fix typo in changelog
diff -Nru abiword-3.0.4~dfsg/debian/control abiword-3.0.4~dfsg/debian/control
--- abiword-3.0.4~dfsg/debian/control	2020-06-13 10:55:40.000000000 +0000
+++ abiword-3.0.4~dfsg/debian/control	2020-06-18 17:38:10.000000000 +0000
@@ -15,13 +15,13 @@
  libchamplain-gtk-0.12-dev,
  libebook1.2-dev (>= 3.8.5),
  libenchant-2-dev,
+ libical-dev (>= 3.0),
  libfribidi-dev,
  libgcrypt20-dev,
  libgirepository1.0-dev,
  libglib2.0-dev,
  libgoffice-0.10-dev,
  libgtk-3-dev,
- libical-dev (>= 3.0),
  libjpeg-dev,
  liblink-grammar-dev,
  libloudmouth1-dev,
@@ -41,7 +41,8 @@
  libwps-dev (>= 0.3),
  libwv-dev,
  libxslt-dev | libxslt1-dev,
- valgrind [amd64 arm64 armhf i386 mips mips64el powerpc ppc64el s390x] <!nocheck>,
+Build-Conflicts:
+               valgrind
 Standards-Version: 4.5.0
 Homepage: http://www.abisource.com/
 Vcs-Browser: https://salsa.debian.org/debian/abiword