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

diff --cc debian/changelog
index 29310b795950e80179e03d8edd18846b6d9450c1,0ab48fd30931129d11b80aba6b21bd7afe867176..e3dc4e050207327a24433e2479710c3e65398c05
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- suricata (1:6.0.4-2+rpi1) bookworm-staging; urgency=medium
++suricata (1:6.0.4-3+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 25 Nov 2021 00:23:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Dec 2021 23:10:51 +0000
++
+ suricata (1:6.0.4-3) unstable; urgency=medium
+ 
+   * Remove suricata-oinkmaster binary package.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Tue, 14 Dec 2021 15:24:47 +0100
  
  suricata (1:6.0.4-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge