Merge version 1.7.0+ds-3+rpi1 and 1.7.0+ds-5 to produce 1.7.0+ds-5+rpi1

diff --cc debian/changelog
index 64abcb933044bccea4dc1051cf43f62bf90cdca6,203de05968f85f419f4114d94a4d126267b01368..db1cb3804111206f557b3651efe04b56ee9baa15
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,14 +1,24 @@@
- gpsbabel (1.7.0+ds-3+rpi1) bullseye-staging; urgency=medium
++gpsbabel (1.7.0+ds-5+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.5.4-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 26 Oct 2017 12:10:21 +0000]
 +  * Remove armhf from architecture list for qtwebengine build-dep, 
 +    we don't have (and may never have) it in Raspbian.
 +  * Remove armhf from architecture list for gpsbabel-gui, it
 +    needs the aforementioned build-dep.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 17 Jul 2020 10:03:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 14 Aug 2020 02:57:31 +0000
++
+ gpsbabel (1.7.0+ds-5) unstable; urgency=medium
+ 
+   * Add patch for i386 test failure
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 07 Aug 2020 15:38:18 +0200
+ 
+ gpsbabel (1.7.0+ds-4) unstable; urgency=medium
+ 
+   * Add patch for endianness issues
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 07 Aug 2020 11:31:04 +0200
  
  gpsbabel (1.7.0+ds-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index d87796b76001cff160212c8ed0d226b37353f54f,2af2336c16fc0c59808ebe4dfab669a22c837556..6d574b3c960ddcf69044477dab0e8ea19b4bc32a
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -7,4 -7,5 +7,6 @@@ htmldoc-locatio
  cross.patch
  gmapbase.html-location
  0009-Drop-mac-libusb-libusb.h-dependency.patch
+ 618.patch
+ 620.patch
 +auto-1.6.0+ds-3+rpi1-1edcf7f4aaa58679f27b343c3ef2291ab331699f-1564383990