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

diff --cc debian/changelog
index 0a1482fc1705af6079f2002d92f43f3c044ca0c4,32a79a387065d9fe2a79c7e9a1ded022872d1561..4f52e25b2015ceee6de91d7d70b32fbd76475d4b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- gpsbabel (1.6.0+ds-10+rpi1) bullseye-staging; urgency=medium
++gpsbabel (1.6.0+ds-11+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, 27 Dec 2019 12:02:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 01 May 2020 07:20:23 +0000
++
+ gpsbabel (1.6.0+ds-11) unstable; urgency=medium
+ 
+   * Add patch for strcmp (Closes: #957304)
+   * bump policy version (no changes)
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Tue, 21 Apr 2020 19:40:57 +0200
  
  gpsbabel (1.6.0+ds-10) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index be055e1accccb3b6a1e478c7457e5873ec9137b2,abe2e67a34bc21bdc39fa2a614fe01a2b1002097..8e726383f87e88109edf0ad653f050dc972f999a
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -11,4 -11,4 +11,5 @@@ htmldoc-locatio
  cross.patch
  0012-The-lezyne-super-gps-every-10th-ride-or-so-outputs-a.patch
  gmapbase.html-location
+ 0014-Use-strncmp-to-compare-array-to-string.patch
 +auto-1.6.0+ds-3+rpi1-1edcf7f4aaa58679f27b343c3ef2291ab331699f-1564383990