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

diff --cc debian/changelog
index 316b34f43908d549115c342f5e254d264ed973bd,3afc140d298a9f3ba6418ac43e4973d84544d439..0a1482fc1705af6079f2002d92f43f3c044ca0c4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,16 +1,26 @@@
- gpsbabel (1.6.0+ds-8+rpi1) bullseye-staging; urgency=medium
++gpsbabel (1.6.0+ds-10+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, 04 Oct 2019 13:10:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 27 Dec 2019 12:02:32 +0000
++
+ gpsbabel (1.6.0+ds-10) unstable; urgency=medium
+ 
+   * [a1fdee8] Install gmapbase.html.
+     Also patch a useful path into gpsbabelfe. (LP: #1015886)
+ 
+  -- Bernd Zeimetz <bzed@debian.org>  Sun, 22 Dec 2019 00:27:08 +0100
+ 
+ gpsbabel (1.6.0+ds-9) unstable; urgency=medium
+ 
+   * [a1fdee8] Install gmapbase.html.
+     Also patch a useful path into gpsbabelfe. (LP: #1015886)
+ 
+  -- Bernd Zeimetz <bzed@debian.org>  Sat, 21 Dec 2019 23:45:28 +0100
  
  gpsbabel (1.6.0+ds-8) unstable; urgency=medium
  

diff --cc debian/patches/series
index 990e5dab98498a6322fe8fc552005e52da893e7c,f9753b992631f04355c4806f555ef37d48ee037b..be055e1accccb3b6a1e478c7457e5873ec9137b2
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -10,4 -10,4 +10,5 @@@ htmldoc-locatio
  0010-Fix-manpage-xml.patch
  cross.patch
  0012-The-lezyne-super-gps-every-10th-ride-or-so-outputs-a.patch
+ gmapbase.html-location
 +auto-1.6.0+ds-3+rpi1-1edcf7f4aaa58679f27b343c3ef2291ab331699f-1564383990