From: Raspbian automatic forward porter Date: Thu, 18 Jun 2020 17:38:11 +0000 (+0100) Subject: Merge version 3.0.4~dfsg-1+rpi1 and 3.0.4~dfsg-2 to produce 3.0.4~dfsg-2+rpi1 X-Git-Tag: raspbian/3.0.4_dfsg-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a60306ba7b662b9cca4f55762d89f2a125aee48d;p=abiword.git Merge version 3.0.4~dfsg-1+rpi1 and 3.0.4~dfsg-2 to produce 3.0.4~dfsg-2+rpi1 --- 80751a3d53153b025efe7177e99ddca28d18e4e4 diff --cc debian/changelog index 4b4cc59,9e6c764..e4f700b --- a/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 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 ++ -- Raspbian forward porter 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 Sat, 13 Jun 2020 12:56:47 +0200 abiword (3.0.4~dfsg-1) unstable; urgency=medium