Manual merge of version 1:6.0.1-3+rpi1 and 1:6.0.3-2 to produce 1:6.0.3-2+rpi1

diff --cc debian/changelog
index 8e0803eb1d089c6dd9fd4ad84dc2b978cf479a24,1dda2c6821a2e9fce2bdfe528cc43176aa450cf2..a2a71d0aa4a206be8df4f9e99064981b90271469
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,40 +1,47 @@@
- suricata (1:6.0.1-3+rpi1) bullseye-staging; urgency=medium
++suricata (1:6.0.3-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Aug 2021 18:48:23 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 06 Sep 2021 04:17:11 +0000
++
+ suricata (1:6.0.3-2) unstable; urgency=medium
+ 
+   * Use 'command -v' instead of 'which' in suricata-oinkmaster cron file.
+     This avoids a runtime deprecation warning on recent versions, and fixes
+     piuparts cron job tests.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Mon, 30 Aug 2021 20:56:18 +0200
+ 
+ suricata (1:6.0.3-1) unstable; urgency=medium
+ 
+   * Upload to unstable post-release.
+   * Remove patch applied upstream.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Wed, 18 Aug 2021 16:33:31 +0200
+ 
+ suricata (1:6.0.3-1~exp2) experimental; urgency=medium
+ 
+   * Also use libatomic workaround on powerpc.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Thu, 01 Jul 2021 19:44:53 +0200
+ 
+ suricata (1:6.0.3-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Bump Standards-Version.
+   * Add Rules-Requires-Root: no.
+   * Raise libhtp minimum version B-D to 0.5.38.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Wed, 30 Jun 2021 23:51:24 +0200
+ 
+ suricata (1:6.0.2-1~exp1) experimental; urgency=medium
+ 
+   * Fix conditional variable use in d/rules.
+   * New upstream release.
+   * Use libhtp 0.5.37.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Fri, 11 Dec 2020 09:45:02 +0100
  
  suricata (1:6.0.1-3) unstable; urgency=medium
  

diff --cc debian/rules
index 943156b9e16341dcb827950dc7b1795d28d8fbc1,87ad47697ceeb47cb9c94273b4b68a2dea96b5a3..5f5d81ded04fc1a1613610624fa846f52af5d0d3
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -11,7 -11,7 +11,7 @@@ include /usr/share/dpkg/architecture.m
  
  # workaround for linking issue on some archs
  export DEB_LDFLAGS_MAINT_APPEND = -Wl,--allow-multiple-definition
- EXTRA_ATOMIC_ARCHS = armel armhf mipsel
 -EXTRA_ATOMIC_ARCHS = armel mipsel powerpc
++EXTRA_ATOMIC_ARCHS = armel armhf mipsel powerpc
  ifneq (,$(findstring $(DEB_HOST_ARCH),$(EXTRA_ATOMIC_ARCHS)))
        DEB_LDFLAGS_MAINT_APPEND += -latomic
        export DEB_LDFLAGS_MAINT_APPEND