Merge version 1.8.0+ds-4+rpi1 and 1.8.0+ds-5 to produce 1.8.0+ds-5+rpi1

diff --cc debian/changelog
index 7c93267727f8a8b44f91603553096fbdabb219f1,b09f4aa0b3119fa46f0d668408d28ccad8137bd3..951897395fc9f2ad5ad4f6ad16d42716d7c1d516
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,15 +1,25 @@@
- gpsbabel (1.8.0+ds-4+rpi1) bookworm-staging; urgency=medium
++gpsbabel (1.8.0+ds-5+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>  Tue, 01 Feb 2022 12:37:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 04 Jul 2022 01:13:52 +0000
++
+ gpsbabel (1.8.0+ds-5) unstable; urgency=medium
+ 
+   [ Debian Janitor ]
+   * Use secure URI in Homepage field.
+   * Set upstream metadata fields: Bug-Database, Bug-Submit.
+ 
+   [ Jochen Sprickerhof ]
+   * Add upstream source
+   * Add workaround for failing lconvert (Closes: #1013610)
+   * Bump policy version (no changes)
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Sat, 25 Jun 2022 21:49:08 +0200
  
  gpsbabel (1.8.0+ds-4) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index 590a0ae7a3b91d05a3eecbab8c49395441812e1f,233dc29fc5639d49e34c3c689d8138ef2a4cd57e..27e59a9c4d86a5fcb96a37bfda36d6d634cf4fce
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -6,4 -6,4 +6,5 @@@ Disable-donation-naggin
  0007-Add-workaround-for-failing-test-on-i386.patch
  0008-Add-Debian-build-flags.patch
  831.patch
+ 0009-Ignore-errors-during-lconvert.patch
 +auto-1.6.0+ds-3+rpi1-1edcf7f4aaa58679f27b343c3ef2291ab331699f-1564383990