Merge version 0.1+git20190320.b499514-1+rpi1 and 0.1+git20221215.85f159e-1 to produce...

diff --cc debian/changelog
index 044c02e379a65a876ca6c4ce80fc91c18083e6cf,a9371eb386d1872e218f3f42d751cd48828c3300..e64e8f5d6bd9265e7e8bd2708c70d74a5c72bb70
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,15 +1,22 @@@
- fermi-lite (0.1+git20190320.b499514-1+rpi1) bullseye-staging; urgency=medium
++fermi-lite (0.1+git20221215.85f159e-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 0.1+git20190320.b499514-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 10:58:01 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 08 May 2021 10:58:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 21 Jun 2025 16:52:26 +0000
++
+ fermi-lite (0.1+git20221215.85f159e-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream version
+   * Cleanup after testing
+     Closes: #1044647
+   * Fix watchfile to detect new versions on github (routine-update)
+   * Standards-Version: 4.7.0 (routine-update)
+   * Do not move header files away from source repository
+     Closes: #1049564
+ 
+  -- Andreas Tille <tille@debian.org>  Sat, 14 Dec 2024 19:47:40 +0100
  
  fermi-lite (0.1+git20190320.b499514-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge