Merge version 1.7.0+ds-7+rpi1 and 1.8.0+ds-4 to produce 1.8.0+ds-4+rpi1

diff --cc debian/changelog
index f93ed3fc85fef20a1935d4e01463be42e707d3bc,f3074234a83f6cdcef7930e802041853deaf569f..7c93267727f8a8b44f91603553096fbdabb219f1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,41 +1,51 @@@
- gpsbabel (1.7.0+ds-7+rpi1) bullseye-staging; urgency=medium
++gpsbabel (1.8.0+ds-4+rpi1) bookworm-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, 22 Oct 2020 19:33:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Feb 2022 12:37:33 +0000
++
+ gpsbabel (1.8.0+ds-4) unstable; urgency=medium
+ 
+   * Drop gmapbase.html (embedded in gpsbabelfe)
+   * Fix HTML documentation.
+     Thanks to tsteven4
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Tue, 25 Jan 2022 23:19:17 +0100
+ 
+ gpsbabel (1.8.0+ds-3) unstable; urgency=medium
+ 
+   * Add qttranslations5-l10n to -gui
+   * Add support for Hurd
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Mon, 24 Jan 2022 16:09:49 +0100
+ 
+ gpsbabel (1.8.0+ds-2) unstable; urgency=medium
+ 
+   * Add patch for failing test on i386
+   * Use Debian build flags for the GUI
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Sun, 23 Jan 2022 22:24:45 +0100
+ 
+ gpsbabel (1.8.0+ds-1) unstable; urgency=medium
+ 
+   * Update Files-Excluded for new upstream version
+   * New upstream version
+   * Rebase patches
+   * Update copyright
+   * Port to qmake
+   * Bump policy versions (no changes)
+   * Update build systems of gpsbabel-gui
+   * Update supported formats
+   * Drop trailing whitespace to please lintian
+   * Add missing build dependency
+   * Support translated gui
+   * Add patch for donation nagging
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Sun, 23 Jan 2022 21:25:59 +0100
  
  gpsbabel (1.7.0+ds-7) unstable; urgency=medium
  

diff --cc debian/control
index d1c0af767e540a271f5a50a9967df8b77eeb826c,420d2ec1e6f40323e5803498548760aac39e7271..be09862a8d863d5441c6316644c84db36e3021e6
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -10,8 -11,10 +11,10 @@@ Build-Depends: debhelper-compat (= 13)
   libusb-1.0-0-dev, zlib1g-dev,
   libshp-dev,
   qtbase5-dev,
-  qtwebengine5-dev [amd64 arm64 i386 mipsel],
 - qtwebengine5-dev [amd64 arm64 armhf i386 mips64el mipsel],
++ qtwebengine5-dev [amd64 arm64 i386 mips64el mipsel],
   qttools5-dev-tools,
+  libqt5serialport5-dev,
+  qttranslations5-l10n,
   imagemagick,
   locales-all,
   xsltproc,
@@@ -74,8 -71,9 +71,9 @@@ Description: GPS file conversion plus t
   This package contains the detailed documentation of gpsbabel.
  
  Package: gpsbabel-gui
- Architecture: amd64 arm64 i386 mipsel
- Depends: ${shlibs:Depends}, ${misc:Depends}, gpsbabel (= ${binary:Version})
 -Architecture: amd64 arm64 armhf i386 mips64el mipsel
++Architecture: amd64 arm64 i386 mips64el mipsel
+ Depends: ${shlibs:Depends}, ${misc:Depends}, gpsbabel (= ${binary:Version}), gpsbabel-doc (= ${source:Version})
+ Recommends: qttranslations5-l10n
  Description: GPS file conversion plus transfer to/from GPS units - GUI
   GPSBabel converts waypoints, tracks, and routes from one format to
   another, whether that format is a common mapping format like Delorme,

diff --cc debian/patches/series
index 6d574b3c960ddcf69044477dab0e8ea19b4bc32a,5cd9d3bfad93fefdb5af7526fd6f1453255dd8dd..590a0ae7a3b91d05a3eecbab8c49395441812e1f
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -2,11 -2,7 +2,8 @@@ gpsbabelfe_disable_version_chec
  gpsbabelfe_opt-in-for-usage-data-reporting
  gpsbabelfe_do-not-check-for-newer-version
  htmldoc-location
- 0006-Use-system-zlib.patch
- 0007-Use-system-shapelib.patch
- cross.patch
- gmapbase.html-location
- 0009-Drop-mac-libusb-libusb.h-dependency.patch
- 618.patch
- 620.patch
+ Disable-donation-nagging
+ 0007-Add-workaround-for-failing-test-on-i386.patch
+ 0008-Add-Debian-build-flags.patch
+ 831.patch
 +auto-1.6.0+ds-3+rpi1-1edcf7f4aaa58679f27b343c3ef2291ab331699f-1564383990