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-06 00:26:42.000000000 +0000 +++ abiword-3.0.4~dfsg/debian/changelog 2020-06-11 12:07:43.000000000 +0000 @@ -1,3 +1,11 @@ +abiword (3.0.4~dfsg-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 3.0.2-8+rpi1 by Peter Michael Green at Fri, 26 Jul 2019 19:02:13 +0000] + * Move valgrind from build-depends to build-conflicts, raspbians valgrind + is problematic. + + -- Raspbian forward porter Thu, 11 Jun 2020 12:07:43 +0000 + abiword (3.0.4~dfsg-1) unstable; urgency=medium [ upstream ] 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-05 23:53:28.000000000 +0000 +++ abiword-3.0.4~dfsg/debian/control 2020-06-11 12:07:43.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] , +Build-Conflicts: + valgrind Standards-Version: 4.5.0 Homepage: http://www.abisource.com/ Vcs-Browser: https://salsa.debian.org/debian/abiword