From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 21 Dec 2021 23:10:51 +0000 (+0000)
Subject: Merge version 1:6.0.4-2+rpi1 and 1:6.0.4-3 to produce 1:6.0.4-3+rpi1
X-Git-Tag: archive/raspbian/1%6.0.4-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9d19943b7d52be919074ffb0d15c6387f515267b;p=suricata.git

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

9d19943b7d52be919074ffb0d15c6387f515267b
diff --cc debian/changelog
index 29310b79,0ab48fd3..e3dc4e05
--- a/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