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

diff --cc debian/changelog
index 6e92f6fafa90634551a6628ffdcd5c418169b7bf,61303d324ccc30f6fb3c529137629a233080635e..adaf70375bfd585fbfc0ffcdff2cf0d0b9ab57f2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- fpc (3.0.4+dfsg-20+rpi1) buster-staging; urgency=medium
++fpc (3.0.4+dfsg-21+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>  Thu, 05 Jul 2018 13:29:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 19 Jan 2019 11:47:16 +0000
++
+ fpc (3.0.4+dfsg-21) unstable; urgency=medium
+ 
+   [ Paul Gevers ]
+   * Drop Recommends: libggi2-dev as it was removed from Debian in 2012.
+     We should probably remove ggigraphs unit as well as it is useless
+   * Drop ancient Breaks/Replaces, add one missing
+ 
+   [ Abou Al Montacir ]
+   * Moved compiler messages files to location expected by Lazarus.
+     The files are anyway architecture independent and it does not hurt
+     to have them in /usr/share. (Closes: Bug#892285)
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Wed, 16 Jan 2019 10:14:10 +0100
  
  fpc (3.0.4+dfsg-20) unstable; urgency=medium
  

diff --cc debian/source/timestamps
index 7aa7b63d2e1766648bf4945c709bb4b73ac05122,64fb08c271b3144df1ebe9d58fc82e258579022d..08043689059e5e0ef4b980a42f0b73c6f937865b
--- 1/debian/source/timestamps
--- 2/debian/source/timestamps
+++ b/debian/source/timestamps
@@@ -208,10 -208,10 +208,11 @@@ fpcsrc/rtl/unix/cthreads.pp 2017-02-24T
  fpcsrc/rtl/unix/cwstring.pp 2017-02-24T10:42+00:00
  fpcsrc/rtl/unix/dl.pp 2017-02-24T10:42+00:00
  fpcsrc/rtl/unix/timezone.inc 2017-02-24T10:42+00:00
- fpcsrc/tests/test/units/sysutils/texpfncase.pp 2018-07-05T13:53+00:00
+ fpcsrc/tests/test/units/sysutils/texpfncase.pp 2019-01-16T15:58+00:00
  fpcsrc/utils/fpcm/fpcmmain.pp 2017-02-24T10:42+00:00
  fpcsrc/utils/fpcm/fpcmwr.pp 2017-02-24T10:42+00:00
 +fpcsrc/utils/fpcm/fpmake.pp 2018-07-05T13:53+00:00
+ fpcsrc/utils/fpcm/fpmake.pp 2019-01-16T15:58+00:00
  fpcsrc/utils/fpcres/fpcres.pas 2017-02-24T10:42+00:00
  fpcsrc/utils/fpcres/target.pas 2017-02-24T10:42+00:00
  fpcsrc/utils/fpdoc/dglobals.pp 2017-02-24T10:42+00:00