Merge version 1.6.0+ds-11+rpi1 and 1.7.0+ds-3 to produce 1.7.0+ds-3+rpi1

diff --cc debian/changelog
index 4f52e25b2015ceee6de91d7d70b32fbd76475d4b,8f347730d95359386f4eff7375f9c547de3b9984..64abcb933044bccea4dc1051cf43f62bf90cdca6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,26 +1,36 @@@
- gpsbabel (1.6.0+ds-11+rpi1) bullseye-staging; urgency=medium
++gpsbabel (1.7.0+ds-3+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, 01 May 2020 07:20:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 17 Jul 2020 10:03:52 +0000
++
+ gpsbabel (1.7.0+ds-3) unstable; urgency=medium
+ 
+   * Fix test logic
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 10 Jul 2020 16:13:04 +0200
+ 
+ gpsbabel (1.7.0+ds-2) unstable; urgency=medium
+ 
+   * Update arch list that ignore test result
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 10 Jul 2020 15:09:25 +0200
+ 
+ gpsbabel (1.7.0+ds-1) unstable; urgency=medium
+ 
+   * New upstream version
+   * Update file excludes
+   * Update d/copyright
+   * Simplify d/watch
+   * rebase patches
+   * bump debhelper version (no changes)
+   * Depend on libusb-1.0-0-dev (Closes: #810420)
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Thu, 09 Jul 2020 21:54:33 +0200
  
  gpsbabel (1.6.0+ds-11) unstable; urgency=medium
  

diff --cc debian/control
index 645bfb90f7087755e719f31b2073e3fff00b2a67,93705fdaf51c195bf2960eddfff0ed3afd8e381f..f672f8ac2e596cdfb4975aee4913a0f6be6b3e66
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -7,10 -7,10 +7,10 @@@ Build-Depends: debhelper-compat (= 13)
   pkg-config,
   libexpat1-dev, expat,
   libxml2-utils,
-  libusb-dev, zlib1g-dev,
+  libusb-1.0-0-dev, zlib1g-dev,
   libshp-dev,
   qt5-default,
 - qtwebengine5-dev [amd64 arm64 armhf i386 mipsel],
 + qtwebengine5-dev [amd64 arm64 i386 mipsel],
   qttools5-dev-tools,
   imagemagick,
   locales-all,

diff --cc debian/patches/series
index 8e726383f87e88109edf0ad653f050dc972f999a,9eeb150ed28bcf825888de7febc2039eca005e1d..d87796b76001cff160212c8ed0d226b37353f54f
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -4,12 -4,6 +4,7 @@@ gpsbabelfe_do-not-check-for-newer-versi
  htmldoc-location
  0006-Use-system-zlib.patch
  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
- 0010-Fix-manpage-xml.patch
  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
+ 0009-Drop-mac-libusb-libusb.h-dependency.patch
 +auto-1.6.0+ds-3+rpi1-1edcf7f4aaa58679f27b343c3ef2291ab331699f-1564383990