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

diff --cc debian/changelog
index 02cb167bc793ed79e659d666d269a968ace2d4e7,c2aa14790e90ec064d4c5b2642a2ad49672bf47d..d3de20d4ef1c12982d82ac2fa02baf004c79a772
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,14 +1,24 @@@
- gpsbabel (1.6.0+ds-3+rpi1) bullseye-staging; urgency=medium
++gpsbabel (1.6.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.
 +
-  -- Peter Micheal Green <plugwash@raspbian.org>  Sat, 27 Jul 2019 20:40:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Aug 2019 20:39:23 +0000
++
+ gpsbabel (1.6.0+ds-5) unstable; urgency=medium
+ 
+   * Only override build-arch in d/rules, fixes building on all
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 26 Jul 2019 15:54:26 +0200
+ 
+ gpsbabel (1.6.0+ds-4) unstable; urgency=medium
+ 
+   * Fix gpsbabel-gui package (Closes: #932875)
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 26 Jul 2019 11:12:00 +0200
  
  gpsbabel (1.6.0+ds-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index f32a26f40122da671dc158d5a63781f55767785e,f3752ea72c055033e8327a27fa0f98ea62a03910..e9e4fab5e5890300bde1ed1e7061dd38a6f9485b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -6,4 -6,4 +6,5 @@@ htmldoc-locatio
  0007-Use-system-shapelib.patch
  0008-Use-usb.h-from-system-include-dir.patch
  0011-Fix-exec-in-gpsbabel.desktop.patch
+ 0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch
 +auto-1.6.0+ds-3+rpi1-1edcf7f4aaa58679f27b343c3ef2291ab331699f-1564383990