Merge version 5.4.0-3+rpi1 and 5.4.1-1 to produce 5.4.1-1+rpi1

diff --cc configure.ac
Simple merge

diff --cc debian/changelog
index f1a6a6fb3f98820a5af7312c027f65981c97b40a,98946c9be744c28423d9d48e34f2e80ed3b3faff..ef7ef7fd8bfaf2b733811fc07b335a485439c54a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,12 +1,26 @@@
- ocaml (5.4.0-3+rpi1) forky-staging; urgency=medium
++ocaml (5.4.1-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 4.08.1-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 26 Nov 2019 19:38:59 +0000]
 +  * Revert previous raspbian changes, changing the triplet 
 +    now seems to cause more problems than it solves (specifically
 +    it causes ocaml to try and use nonexistant compilers).
 +  * Edit configure.ac to select armv6 when using "arm-linux-gnueabihf"
 +  * Partially fix clean target.
 +
 +  [changes introduced in 4.08.1-5+rpi1 by Peter Michael Green]
 +  * Remove gitattributes that cause problems for dgit.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Feb 2026 21:33:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 03 Jul 2026 10:46:36 +0000
++
+ ocaml (5.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release (Closes: #1129317, CVE-2026-28364)
+   * Stabilize compiler-libs ABI by not including config.cmx
+   * Print .cmi flags in objinfo
+   * Bump Standards-Version to 4.7.3
+   * Remove Priority field from debian/control
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Tue, 16 Jun 2026 21:25:11 +0200
  
  ocaml (5.4.0-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index e1a7c8cd759aa98f01c30f998a25b946b0a1df6c,21780bba88d3cd1caca863e9246649349eb5b1e7..92e866fcd567df2803aaf29ef87ebbf596157b95
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -3,6 -3,5 +3,7 @@@ Trigger-output-complete-exe-on-custom-w
  Do-not-error-on-warnings-in-autoconf.patch
  Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
  Mark-test_compact_manydomains-as-multicore.patch
- Increase-the-amount-of-data-written-to-a-pipe-in-a-test.patch
+ Compile-utils-config.-cmi-cmx-with-opaque.patch
+ Print-.cmi-flags-in-objinfo.patch
 +use-armv6-for-raspbian.patch
 +remove-gitattributes-that-cause-problems.patch

diff --cc debian/rules
Simple merge