Merge version 0.10-1+rpi1 and 0.10-2 to produce 0.10-2+rpi1

diff --cc debian/changelog
index 3a9c0a132a54a6de72f74bd3c5ee503306e3c6cb,d4411f23c36de1d69dccdd9bfc4f0be2141800be..4f0681b4bc4cf99bd0553733a31867c86558e373
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,19 @@@
- ocaml-eqaf (0.10-1+rpi1) trixie-staging; urgency=medium
++ocaml-eqaf (0.10-2+rpi1) forky-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 03 Oct 2024 08:36:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 10 Jul 2026 17:40:34 +0000
++
+ ocaml-eqaf (0.10-2) unstable; urgency=medium
+ 
+   * Fix tests with OCaml 5.5.0
+   * Bump Standards-Version to 4.7.4
+   * Remove Priority and Rules-Requires-Root from debian/control
+   * Use dh_ocamllibinstall and set dune_layout_version to 1
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Tue, 30 Jun 2026 10:14:55 +0200
  
  ocaml-eqaf (0.10-1) unstable; urgency=medium
  

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

diff --cc debian/patches/series
index 303e69fd02cf0d3abf28e64bb1194c85869c40f5,0ba7848064bc7290da84a289308c36fcf893b40f..baa09e83885277768b3e4af7b4cd339864f5e869
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,2 +1,3 @@@
  0001-Handle-unknown-ocaml-system-as-Linux.patch
+ 0002-Fix-tests-with-OCaml-5.5.0.patch
 +disable-afl.patch