Merge version 3.0.4+dfsg-22+rpi1 and 3.0.4+dfsg-23 to produce 3.0.4+dfsg-23+rpi1

diff --cc debian/changelog
index 8bdc29d1e5b0c921853a283bc67a03d6f1c5d277,790afc599bb9ccf734e332bf22a82523d8c81d6d..eea6f81e52d3d5a988c0e411a514c65dfd7cc2d2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- fpc (3.0.4+dfsg-22+rpi1) buster-staging; urgency=medium
++fpc (3.0.4+dfsg-23+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 04 Feb 2019 04:47:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Nov 2019 13:08:51 +0000
++
+ fpc (3.0.4+dfsg-23) unstable; urgency=medium
+ 
+   * Fixed a bug causing fpdoc to fail silently.
+   * Fixed documentation causing fpdoc to crash. (Closes: Bug#939414)
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Mon, 25 Nov 2019 22:51:22 +0100
  
  fpc (3.0.4+dfsg-22) unstable; urgency=medium
  

diff --cc debian/patches/series
index 394835c5004f44c6b256c6b1ddd1268a4d6aef37,9145e4fc66c8aa72b72b5e4f6d9d9708403794d0..e625e2dd47835283cd28002d72343b9b3842c866
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -36,4 -36,5 +36,6 @@@ ncurses6.patc
  fpc-r38400.patch
  arm64-select.patch
  arm64-subsetreg-32.patch
+ Fix-exit-code-on-fpdoc.patch
+ Fix-documentation-causing-fpdoc-to-crash.patch
 +raspbian.diff