From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 13 Jun 2022 05:59:31 +0000 (+0100)
Subject: Merge version 1:6.0.5-2+rpi1 and 1:6.0.5-3 to produce 1:6.0.5-3+rpi1
X-Git-Tag: archive/raspbian/1%6.0.5-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=49d049835b9e84f67c2c13335b9482567b6c9dd9;p=suricata.git

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

49d049835b9e84f67c2c13335b9482567b6c9dd9
diff --cc debian/changelog
index 072a628d,b4bdedf7..a3b0cafb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- suricata (1:6.0.5-2+rpi1) bookworm-staging; urgency=medium
++suricata (1:6.0.5-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>  Fri, 06 May 2022 06:46:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Jun 2022 05:59:30 +0000
++
+ suricata (1:6.0.5-3) unstable; urgency=medium
+ 
+   * Add patch to handle undefined LEVEL1_DCACHE_LINESIZE.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Wed, 01 Jun 2022 11:33:06 +0200
  
  suricata (1:6.0.5-2) unstable; urgency=medium