Merge version 3.0.4+dfsg-18+rpi1 and 3.0.4+dfsg-19 to produce 3.0.4+dfsg-19+rpi1

diff --cc debian/changelog
index 5e94edc3d0a9bf7939a04d71095d8f4bb9cdeadb,3cf0b30dc0c59f6df7fd1f910942100dda7cfaea..ce8c28aaacf8ad02eb89c5bdb91844dbf9f72907
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- fpc (3.0.4+dfsg-18+rpi1) buster-staging; urgency=medium
++fpc (3.0.4+dfsg-19+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>  Wed, 02 May 2018 04:16:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 15 May 2018 03:47:39 +0000
++
+ fpc (3.0.4+dfsg-19) unstable; urgency=medium
+ 
+   [Graham Inggs]
+   * Fixed ppc suffix in fpcmake to be compatible with ppc executable name
+     On Motorola 68000, FPC builds compiler named ppc68k while
+     fpcmake looks for ppcm68k to set default FPCDIR value
+     See #892285
+ 
+   [Peter Michael Green]
+   * Move Grahams fpcmake m68k change into it's own patch fpcmake-m68k.patch
+   * Apply Sven Joachim's patch for ncurses6 (Closes: 898017)
+   * Add breaks libncursesw5-dev (<< 6.1+20180210) to fp-units-base
+   * Add note to debian/control about ncurses adjustments needed when
+     backporting.
+ 
+  -- Peter Michael Green <plugwash@debian.org>  Sat, 12 May 2018 01:36:01 +0100
  
  fpc (3.0.4+dfsg-18) unstable; urgency=medium
  

diff --cc debian/patches/series
index 7154a28df5c394d503bebf21571aad2a5bb4c15b,3ae69ecae4046d4c8240d7cbc95228a6c2d17568..da9052911de02d6172118ad7461df75a33568edf
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -31,4 -31,5 +31,6 @@@ fix-units-path-to-be-multi-arch-safe.pa
  fix_make_files_generation.patch
  fix-IDE-GDB-support.patch
  clean_man_pages.patch
+ fpcmake-m68k.patch
+ ncurses6.patch
 +raspbian.diff