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

diff --cc debian/changelog
index d3de20d4ef1c12982d82ac2fa02baf004c79a772,578248323c4c984997c05177c50fc0aa6a562d94..7e6d9ef718d230f30db2f40d648d37f045573d8e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,19 +1,29 @@@
- gpsbabel (1.6.0+ds-5+rpi1) bullseye-staging; urgency=medium
++gpsbabel (1.6.0+ds-7+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, 01 Aug 2019 20:39:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Sep 2019 19:31:06 +0000
++
+ gpsbabel (1.6.0+ds-7) unstable; urgency=medium
+ 
+   * Drop old build dependency
+   * Fix build depends
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Tue, 03 Sep 2019 23:46:06 +0200
+ 
+ gpsbabel (1.6.0+ds-6) unstable; urgency=medium
+ 
+   * Use upstream manpage
+     (Closes: #522332, #618856, #803509, #803512, #698326, #862299)
+   * Drop note about quilt
+   * Add patch for cross compilation.
+     Thanks to Helmut Grohne (Closes: #934849)
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Tue, 03 Sep 2019 21:28:10 +0200
  
  gpsbabel (1.6.0+ds-5) unstable; urgency=medium
  

diff --cc debian/control
index ed1738832acb9b833526ef09b713f320bdc22c6f,bc21d7dcf0381a6a839d0a0aaffd6554008704dd..791a267ad78340b83ba3b3adee88eded73e90d52
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -10,12 -10,13 +10,13 @@@ Build-Depends: debhelper-compat (= 12)
   libusb-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
- Build-Depends-Indep: fop, xsltproc, docbook-xml,
-  docbook-xsl, libpaper-dev 
+  locales-all,
+  xsltproc,
+  docbook-xsl
+ Build-Depends-Indep: fop, docbook-xml, libpaper-dev
  Standards-Version: 4.4.0
  Rules-Requires-Root: no
  Homepage: http://www.gpsbabel.org/

diff --cc debian/patches/series
index e9e4fab5e5890300bde1ed1e7061dd38a6f9485b,f4937223b943c5f2bc6e4a3ef56e928a5f3b449b..323aeacc87d42930061b24b6a51bab7879793af9
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -7,4 -7,5 +7,6 @@@ htmldoc-locatio
  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
 +auto-1.6.0+ds-3+rpi1-1edcf7f4aaa58679f27b343c3ef2291ab331699f-1564383990