Manual merge of version 3.2.0+dfsg-11+rpi1 and 3.2.0+dfsg-12 to produce 3.2.0+dfsg...

diff --cc debian/changelog
index d80e59495b2adcd66ae248ad25913beff81ef9d2,30dd30c10f579dde24368c6679683bde6fe80778..d76d82fe34df8c0c38b2035726db7d2764e3ebcf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,20 @@@
- fpc (3.2.0+dfsg-11+rpi1) bullseye-staging; urgency=medium
++fpc (3.2.0+dfsg-12+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.4+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 20 Oct 2014 23:12:17 +0000]
 +  * Set compiler defaults for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Jan 2021 20:35:41 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Feb 2021 05:46:18 +0000
++
+ fpc (3.2.0+dfsg-12) unstable; urgency=medium
+ 
+   [ Graham Inggs ]
+   * Drop unnecessary build dependency on binutils
+ 
+   [ Abou Al Montacir ]
+   * Disable FPU inlining on m68k.
+     Thanks to John Paul Adrian Glaubitz (Closes: Bug#980841)
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Mon, 25 Jan 2021 22:36:28 +0100
  
  fpc (3.2.0+dfsg-11) bullseye; urgency=medium
  

diff --cc debian/patches/series
index f26436c50851a83ea2174f39739f23c56c798e6f,c6fc234c3d586e4dd4798e71cb8e65c8b05c3c0a..832e9d54ff457969edf89d65dc147ef9f4767db3
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -20,7 -20,6 +20,7 @@@ fix_make_files_generation.patc
  #fix-IDE-GDB-support.patch
  clean_man_pages.patch
  ncurses6.patch
- fix-FTBFS-on-m68k.patch
+ m68k-disable-FPU-inlining.patch
  Fix-liking-with-libc-when-PIC-is-enabled.patch
  fix-utest-version-lists.patch
 +raspbian.diff