Merge version 1.6.0+ds-7+rpi1 and 1.6.0+ds-8 to produce 1.6.0+ds-8+rpi1

diff --cc debian/changelog
index 7e6d9ef718d230f30db2f40d648d37f045573d8e,da46a4f97380fadf54def010b085161efae4b0e7..316b34f43908d549115c342f5e254d264ed973bd
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- gpsbabel (1.6.0+ds-7+rpi1) bullseye-staging; urgency=medium
++gpsbabel (1.6.0+ds-8+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>  Thu, 12 Sep 2019 19:31:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Oct 2019 13:10:11 +0000
++
+ gpsbabel (1.6.0+ds-8) unstable; urgency=medium
+ 
+   * Add patch for "super gps"
+     Thanks to Tim Connors (Closes: #935373)
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Tue, 24 Sep 2019 22:09:09 +0200
  
  gpsbabel (1.6.0+ds-7) unstable; urgency=medium
  

diff --cc debian/patches/series
index 323aeacc87d42930061b24b6a51bab7879793af9,64be841375da292e5bcb5b958e9598992d8056d5..990e5dab98498a6322fe8fc552005e52da893e7c
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -9,4 -9,4 +9,5 @@@ htmldoc-locatio
  0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch
  0010-Fix-manpage-xml.patch
  cross.patch
+ 0012-The-lezyne-super-gps-every-10th-ride-or-so-outputs-a.patch
 +auto-1.6.0+ds-3+rpi1-1edcf7f4aaa58679f27b343c3ef2291ab331699f-1564383990