Merge version 1:6.0.10-1+rpi1 and 1:7.0.1-1 to produce 1:7.0.1-1+rpi1

diff --cc debian/changelog
index dacb8eb0b173f274e0c0301eb7909b25f494e3a5,69a683b87b8d46f9d9c5c796baa706249b28e137..5475d6cecb83532e82d3397585a63270418f0441
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,54 +1,61 @@@
- suricata (1:6.0.10-1+rpi1) bookworm-staging; urgency=medium
++suricata (1:7.0.1-1+rpi1) trixie-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, 03 Feb 2023 04:51:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 23 Sep 2023 01:40:42 +0000
++
+ suricata (1:7.0.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Fri, 15 Sep 2023 21:18:47 +0200
+ 
+ suricata (1:7.0.0-2) unstable; urgency=medium
+ 
+   * Fix FTBFS on armel and mipsel by fixing -latomic addition in LDFLAGS.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Thu, 20 Jul 2023 11:03:07 +0200
+ 
+ suricata (1:7.0.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop Arturo Borrero Gonzalez from Uploaders at his request.
+   * Use new project website at suricata.io.
+   * Remove patches applied upstream.
+   * Change PCRE lib dependency to libpcre2.
+   * Bump versioned libhtp dependency to 0.5.45 or later.
+   * Bump versioned Rust dependency to 1.61 or later.
+   * Bump watchfile to version 4.
+   * Remove obsolete dependency on lsb-base.
+   * Remove obsolete entries in d/copyright.
+   * Remove versions in Conflicts/Replaces.
+   * Remove obsolete dh_strip override.
+   * Bump d/copyright dates.
+   * Update/fix Lintian overrides regarding eBPF file distribution.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Wed, 19 Jul 2023 10:14:37 +0200
+ 
+ suricata (1:6.0.13-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Raise libhtp minimum dependency version to 0.5.44.
+   * Bump Standards-Version.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Thu, 15 Jun 2023 23:45:03 +0200
+ 
+ suricata (1:6.0.12-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Tue, 09 May 2023 15:58:02 +0200
+ 
+ suricata (1:6.0.11-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Raise libhtp minimum dependency version to 0.5.43.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Thu, 13 Apr 2023 23:53:02 +0200
  
  suricata (1:6.0.10-1) unstable; urgency=medium
  

diff --cc debian/rules
index f7d76abbb595fc04e543bb4cc752f878a3e7e34b,13f654efb8ebb1fdf4b40e61ff1e6dc0a1428805..5198d40159ba70d59b260d254340220cf34f719a
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -11,9 -11,9 +11,9 @@@ 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 mipsel powerpc
 +EXTRA_ATOMIC_ARCHS = armel armhf mipsel powerpc
  ifneq (,$(findstring $(DEB_HOST_ARCH),$(EXTRA_ATOMIC_ARCHS)))
-       DEB_LDFLAGS_MAINT_APPEND += -latomic
+       DEB_LDFLAGS_MAINT_APPEND +=  -Wl,--no-as-needed -Wl,-latomic -Wl,--as-needed
        export DEB_LDFLAGS_MAINT_APPEND
  endif