Merge version 4.11.1-4+rpi1 and 4.11.1-5 to produce 4.11.1-5+rpi1

diff --cc debian/changelog
index 5e7b0ee1e7a7c50926554b2d677648e1629963c3,2f5114096a596d32b96322e7b479f8c423c0b9fe..8feeb560719bdec5654d53238277885981d64176
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,10 +1,24 @@@
- ocaml (4.11.1-4+rpi1) bullseye-staging; urgency=medium
++ocaml (4.11.1-5+rpi1) bookworm-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>  Sat, 07 Nov 2020 23:17:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Dec 2021 16:21:02 +0000
++
+ ocaml (4.11.1-5) unstable; urgency=medium
+ 
+   * Do not error on warnings in autoconf (Closes: #978875)
+   * Bump Standards-Version to 4.6.0
+   * Update debian/watch
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Thu, 25 Nov 2021 15:45:31 +0100
  
  ocaml (4.11.1-4) unstable; urgency=medium
  

diff --cc debian/patches/series
index 2db478e1453632580b2b1d85e12aaa042d1d05dc,cbb4715de093edcfe6691f5fc0866c7e8f393827..061d1be53f5c4baa4fbbee48c757c910750d496a
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -6,5 -6,4 +6,6 @@@
  0006-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch
  0007-Trigger-output-complete-exe-on-custom-with-an-enviro.patch
  0008-Statically-link-lib-bfd-iberty.patch
+ 0009-Do-not-error-on-warnings-in-autoconf.patch
 +use-armv6-for-raspbian.patch
 +remove-gitattributes-that-cause-problems.patch