Merge version 4.99.3+dfsg-2+rpi1 and 4.99.4+dfsg-2 to produce 4.99.4+dfsg-2+rpi1

diff --cc debian/changelog
index 3f565f8e818c18c0625e3ccb2f0e273af4e8bf5e,d5e803d61ae555c8894358a7f5589cb8155c2e66..0f48c49669723e850291aecb50739f692fb9505f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,21 +1,28 @@@
- lsof (4.99.3+dfsg-2+rpi1) trixie-staging; urgency=medium
++lsof (4.99.4+dfsg-2+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 4.99.3+dfsg-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 18 Feb 2025 01:16:47 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 18 Feb 2025 01:16:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 07 Mar 2025 07:00:20 +0000
++
+ lsof (4.99.4+dfsg-2) unstable; urgency=medium
+ 
+   * Rename no-socket-state-test.patch to disable-tests.patch, and disable
+     another test that causes FTBFS on the buildds.
+ 
+  -- Andres Salomon <dilinger@debian.org>  Wed, 19 Feb 2025 22:59:10 +0000
+ 
+ lsof (4.99.4+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release; fixes gcc-15 build issues (closes: #1097318)
+   * d/patches/version.patch: drop, merged upstream.
+   * d/patches/netcat.patch: drop, merged upstream.
+   * Update standards-version to 4.7. No changes needed.
+   * Build-dep on netcat(-openbsd) to enable various tests.
+   * d/patches/no-socket-state-test.patch: add fix to skip test that
+     hangs indefinitely.
+ 
+  -- Andres Salomon <dilinger@debian.org>  Tue, 18 Feb 2025 05:45:12 +0000
  
  lsof (4.99.3+dfsg-2) unstable; urgency=low