Merge version 1:6.0.3-2+rpi1 and 1:6.0.4-2 to produce 1:6.0.4-2+rpi1

diff --cc debian/changelog
index a2a71d0aa4a206be8df4f9e99064981b90271469,aad63e9416793fa23046417c2345871f7a7168a8..29310b795950e80179e03d8edd18846b6d9450c1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,21 @@@
- suricata (1:6.0.3-2+rpi1) bookworm-staging; urgency=medium
++suricata (1:6.0.4-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1:6.0.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 12:21:01 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 06 Sep 2021 04:17:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 25 Nov 2021 00:23:26 +0000
++
+ suricata (1:6.0.4-2) unstable; urgency=medium
+ 
+   * Raise libhtp minimum dependency version to 0.5.39.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Thu, 18 Nov 2021 22:57:47 +0100
+ 
+ suricata (1:6.0.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Thu, 18 Nov 2021 22:00:08 +0100
  
  suricata (1:6.0.3-2) unstable; urgency=medium