Merge version 1.4.193-1+rpi1 and 1.5.141-1 to produce 1.5.141-1+rpi1

diff --cc debian/changelog
index 1e347d70590a1a4532fcd6332cd64f250f256df0,ffdba3073b66d86e9f269c358734faf286bceafb..69f89af8e848575a4bdedd78a7664e4c8d475eb0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,49 +1,56 @@@
- mfgtools (1.4.193-1+rpi1) bookworm-staging; urgency=medium
++mfgtools (1.5.141-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 1.4.193-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 21 Jun 2022 09:37:45 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 21 Jun 2022 09:37:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 21 Jun 2024 21:04:27 +0000
++
+ mfgtools (1.5.141-1) unstable; urgency=medium
+ 
+   [ Andreas Henriksson ]
+   * New upstream release.
+ 
+   [ Chris Hofstaedtler ]
+   * Use udev.pc to place udev rules file (Closes: #1057829)
+ 
+  -- Andreas Henriksson <andreas@fatal.se>  Sun, 10 Dec 2023 09:08:27 +0100
+ 
+ mfgtools (1.5.139-1) unstable; urgency=medium
+ 
+   * Cleanup generated .tarball-version (Closes: #1049209)
+   * New upstream release.
+ 
+  -- Andreas Henriksson <andreas@fatal.se>  Sun, 05 Nov 2023 21:46:29 +0100
+ 
+ mfgtools (1.5.125-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Andreas Henriksson <andreas@fatal.se>  Thu, 10 Aug 2023 13:19:00 +0200
+ 
+ mfgtools (1.5.109-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * debian/rules: remove generated manpage on clean
+ 
+  -- Andreas Henriksson <andreas@fatal.se>  Mon, 03 Jul 2023 17:04:12 +0200
+ 
+ mfgtools (1.5.21-2) unstable; urgency=medium
+ 
+   * Generate udev 70-uuu.rules at build and ship it
+ 
+  -- Andreas Henriksson <andreas@fatal.se>  Wed, 28 Jun 2023 14:45:57 +0200
+ 
+ mfgtools (1.5.21-1) experimental; urgency=medium
+ 
+   * debian/gbp.conf: Set upstream-vcs-tag
+   * New upstream release. (Closes: #1032882)
+   * Update build-deps according to upstream changes
+     - Drop libzip-dev
+     - Add libzstd-dev
+   * Add myself to uploaders
+ 
+  -- Andreas Henriksson <andreas@fatal.se>  Mon, 13 Mar 2023 14:39:10 +0100
  
  mfgtools (1.4.193-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge