Manual merge of version 3.0.4+dfsg-21+rpi1 and 3.0.4+dfsg-22 to produce 3.0.4+dfsg...

diff --cc debian/changelog
index adaf70375bfd585fbfc0ffcdff2cf0d0b9ab57f2,295cbf2fef452008de70d6f95117a69547c15f9e..8bdc29d1e5b0c921853a283bc67a03d6f1c5d277
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,21 @@@
- fpc (3.0.4+dfsg-21+rpi1) buster-staging; urgency=medium
++fpc (3.0.4+dfsg-22+rpi1) buster-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>  Sat, 19 Jan 2019 11:47:16 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 04 Feb 2019 04:47:04 +0000
++
+ fpc (3.0.4+dfsg-22) unstable; urgency=medium
+ 
+   * debian/patches/arm64-select.patch
+     - Fix fpSelect with nil timestamp on aarch64 (closes: 888782)
+   * debian/patches/arm64-subsetreg-32.patch
+     - when optimising subsetreg moves for aarch64, take into account the fact
+       that the subsetreg itself can be 32 or 64 bit
+     - fixes "Incorrect record member value when returned from a function". 
+       (closes: 895693)
+ 
+  -- Peter Michael Green <plugwash@debian.org>  Thu, 24 Jan 2019 23:27:02 +0000
  
  fpc (3.0.4+dfsg-21) unstable; urgency=medium
  

diff --cc debian/patches/series
index 134b3a88aca79a579477976cf2b1de31a83338b9,e8823de634c2a31a8bdb9fc868176653b8f37c7b..394835c5004f44c6b256c6b1ddd1268a4d6aef37
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -34,4 -34,5 +34,6 @@@ clean_man_pages.patc
  fpcmake-m68k.patch
  ncurses6.patch
  fpc-r38400.patch
+ arm64-select.patch
+ arm64-subsetreg-32.patch
 +raspbian.diff