Manual merge of version 4.11.1-5+rpi1 and 4.13.1-3 to produce 4.13.1-3+rpi1

diff --cc .gitattributes
index a917a27024e401db4a4b679132a1a5272a38c601,956d21360b4f2d5ecf38c3dc7e64b98ed66dc444..a278ffe01348311a85e9a1cbb388e2d71fa6c9e3
--- 1/.gitattributes
--- 2/.gitattributes
+++ b/.gitattributes
@@@ -140,7 -151,9 +151,8 @@@ menhir-bench.bash typo.missing-header t
  *.check-program-output text eol=lf
  *.run text eol=lf
  
 -/tools/ci/appveyor/appveyor_build.cmd text eol=crlf
  
+ aclocal.m4 typo.tab
  configure.ac text eol=lf
  build-aux/compile text eol=lf
  build-aux/config.guess text eol=lf

diff --cc configure.ac
index 1fb75673daec7a38c4057da3e66e003cc2918d3b,9ac019f756cd036e448d5e1b5c535f1bb87ab2e4..03f0fd95dc5c4e8b56946485dba958cbc5467512
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -927,13 -1087,13 +1087,13 @@@ AS_CASE([$host]
      [arch=arm; model=armv6; system=netbsd],
    [earmv7*-*-netbsd*],
      [arch=arm; model=armv7; system=netbsd],
-   [armv5te*-*-linux-gnueabi],
+   [armv5te*-*-linux-*eabi],
      [arch=arm; model=armv5te; system=linux_eabi],
-   [armv5*-*-linux-gnueabi],
+   [armv5*-*-linux-*eabi],
      [arch=arm; model=armv5; system=linux_eabi],
-   [arm*-*-linux-gnueabihf],
+   [arm*-*-linux-*eabihf],
 -    [arch=arm; system=linux_eabihf],
 +    [arch=arm; model=armv6; system=linux_eabihf],
-   [arm*-*-linux-gnueabi],
+   [arm*-*-linux-*eabi],
      [arch=arm; system=linux_eabi],
    [arm*-*-openbsd*],
      [arch=arm; system=bsd],

diff --cc debian/changelog
index 8feeb560719bdec5654d53238277885981d64176,cc05652e51f8fe8388abef54340b654e24ea1663..2d12083d1719e9f6c25df9042e40d3a32d9312b2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,27 +1,41 @@@
- ocaml (4.11.1-5+rpi1) bookworm-staging; urgency=medium
++ocaml (4.13.1-3+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>  Thu, 02 Dec 2021 16:21:02 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 03 Feb 2022 18:25:38 +0000
++
+ ocaml (4.13.1-3) unstable; urgency=medium
+ 
+   * Upload to unstable
+   * Adapt maintainer scripts to new binary package structure
+   * Do no longer provide /usr/include/caml symlink
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Wed, 19 Jan 2022 11:14:42 +0100
+ 
+ ocaml (4.13.1-2) experimental; urgency=medium
+ 
+   * Put transitional packages in section oldlibs
+   * Fix building of manpages on bytecode architectures
+   * Restore patch putting manpages in section 3o
+   * Enable fma emulation on m68k
+   * Ignore tests failure on m68k
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Wed, 22 Dec 2021 08:17:13 +0100
+ 
+ ocaml (4.13.1-1) experimental; urgency=medium
+ 
+   * New upstream release
+   * Make *-nox packages transitional
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Tue, 21 Dec 2021 16:33:05 +0100
  
  ocaml (4.11.1-5) unstable; urgency=medium
  

diff --cc debian/patches/series
index 061d1be53f5c4baa4fbbee48c757c910750d496a,2924ded559c6fcdee866866578adfb7f77f84a30..9c41ac121c6d739b6ccc8d4bc96a209afbce592b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,7 +1,9 @@@
  0001-Don-t-use-rpath.patch
- 0002-Put-manpages-in-section-3o-instead-of-3.patch
- 0003-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
- 0004-Check-for-definition-of-AT_SECURE-before-using-it.patch
- 0005-read_main_debug_info-do-not-die-in-custom-executable.patch
- 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
+ 0002-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
+ 0003-Check-for-definition-of-AT_SECURE-before-using-it.patch
+ 0004-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch
+ 0005-Trigger-output-complete-exe-on-custom-with-an-enviro.patch
+ 0006-Do-not-error-on-warnings-in-autoconf.patch
+ 0007-Put-manpages-in-section-3o-instead-of-3.patch
 +use-armv6-for-raspbian.patch
 +remove-gitattributes-that-cause-problems.patch

diff --cc debian/rules
Simple merge