From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 9 Apr 2020 11:52:55 +0000 (+0100)
Subject: Merge version 3.0.2-9+rpi1 and 3.0.2-10 to produce 3.0.2-10+rpi1
X-Git-Tag: archive/raspbian/3.0.2-10+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=65ba2d5986c7d9dafd54ea80ad0d981683baa5c2;p=abiword.git

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

65ba2d5986c7d9dafd54ea80ad0d981683baa5c2
diff --cc debian/changelog
index 62f02ba,3ef02d1..f2ba155
--- a/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