Merge version 1:7.0.3-1+rpi1 and 1:7.0.7-1 to produce 1:7.0.7-1+rpi1

diff --cc debian/changelog
index 6ccb25d942adeec400980ee5bcc878ebc2d85a9f,8bc144dce645acc995d92adb89860b231d2097e3..bde616231c47c8fe6c6f25e13b56980ab7accfec
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,39 +1,46 @@@
- suricata (1:7.0.3-1+rpi1) trixie-staging; urgency=medium
++suricata (1:7.0.7-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>  Sat, 17 Feb 2024 04:32:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Oct 2024 21:01:22 +0000
++
+ suricata (1:7.0.7-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bump versioned libhtp dependency to 0.5.49 or later.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Mon, 14 Oct 2024 10:48:09 +0200
+ 
+ suricata (1:7.0.6-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Re-enable tests.
+   * Bump copyright date for debian/ directory.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Thu, 27 Jun 2024 14:29:40 +0200
+ 
+ suricata (1:7.0.5-2) unstable; urgency=medium
+ 
+   * Disable tests that need builds for now.
+     Meant to remove one of the roadblocks towards testing migration.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Wed, 24 Apr 2024 23:01:32 +0200
+ 
+ suricata (1:7.0.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bump versioned libhtp dependency to 0.5.48 or later.
+   * Remove (probably buggy) Rust constraint from d/rules.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Tue, 23 Apr 2024 15:12:33 +0200
+ 
+ suricata (1:7.0.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bump versioned libhtp dependency to 0.5.47 or later.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Wed, 20 Mar 2024 13:41:22 +0100
  
  suricata (1:7.0.3-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge