Merge version 0.9-4+rpi1 and 0.10-1 to produce 0.10-1+rpi1

diff --cc debian/changelog
index 24d43d3390e00e2fc3203d07441dad332208c55e,4e2ffe90be70d2672e1cbcdac9eeda0d1599ce5f..3a9c0a132a54a6de72f74bd3c5ee503306e3c6cb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,17 @@@
- ocaml-eqaf (0.9-4+rpi1) trixie-staging; urgency=medium
++ocaml-eqaf (0.10-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 0.9-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 22 Dec 2023 04:14:19 +0000]
 +  * Remove build-dependency on libcrowbar-ocaml-dev.
 +  * Disable tests which use afl++ via crowbar.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 22 Dec 2023 04:14:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 Oct 2024 08:36:50 +0000
++
+ ocaml-eqaf (0.10-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Bump Standards-Version to 4.7.0
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Tue, 20 Aug 2024 09:01:02 +0200
  
  ocaml-eqaf (0.9-4) unstable; urgency=medium
  

diff --cc debian/control
index a29553d95c8eb8b9c708fa2c8e2af961fc677f27,b233a7957fa383528b9c011f212f3e0bcb58f8e3..7e5500b0991174ba90881d48e8c7447ec9e64cbf
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -9,8 -9,9 +9,8 @@@ Build-Depends
   ocaml-dune,
   libcstruct-ocaml-dev,
   libalcotest-ocaml-dev <!nocheck>,
 - libcrowbar-ocaml-dev <!nocheck>,
   dh-ocaml (>= 1.2)
- Standards-Version: 4.6.2
+ Standards-Version: 4.7.0
  Rules-Requires-Root: no
  Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-eqaf
  Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-eqaf.git

diff --cc eqaf.opam
index 87c3f3152a51057c582b115235208d247ddb4868,0f32fef712ecdc2a38fea1f56f67bb13438507f5..c525e9a3b39584d4470ce11c0b5a65c227fc1c91
--- 1/eqaf.opam
--- 2/eqaf.opam
+++ b/eqaf.opam
@@@ -21,9 -20,9 +20,8 @@@ build: 
  depends: [
    "ocaml"          {>= "4.07.0"}
    "dune"           {>= "2.0"}
-   "cstruct"        {>= "1.1.0"}
-   "base64"         {with-test}
+   "base64"         {with-test & >= "3.0.0"}
    "alcotest"       {with-test}
 -  "crowbar"        {with-test}
    "fmt"            {with-test & >= "0.8.7"}
    "bechamel"       {with-test}
- ]
+ ]