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

diff --cc debian/changelog
index 43abaae0a2de0248a6e4a92aa9ce4b6c4ed23199,a19bee142b4d81ce2172a642304b5de50fae1c89..5e94edc3d0a9bf7939a04d71095d8f4bb9cdeadb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- fpc (3.0.4+dfsg-17+rpi1) buster-staging; urgency=medium
++fpc (3.0.4+dfsg-18+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>  Mon, 30 Apr 2018 00:12:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 02 May 2018 04:16:09 +0000
++
+ fpc (3.0.4+dfsg-18) unstable; urgency=medium
+ 
+   * Remove dpkg-architecture calls to reduce build time and lintian warnings
+   * Changed Vcs-Git and Vcs-Browser to point to salsa.debian.org.
+     This removes lintian warnings about old repository links.
+   * Cleaned man page for fpcjres tool to be lintian warnings free.
+   * Fixed ppc suffix in fpcmake to be compatible with ppc executable name.
+     For arm64 architecture, FPC make files build compiler as ppca64 while
+     fpcmake looks for ppcxaarch64 to set default FPCDIR value.
+     Thanks to Graham Inggs (Closes: Bug#892285)
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sun, 22 Apr 2018 16:10:23 +0200
  
  fpc (3.0.4+dfsg-17) unstable; urgency=medium
  

diff --cc debian/patches/series
index 390e89ed67670a7bd246ac56c03d8cd785ddc1ef,be02f796c5ccf9431040d497545c3ec543a79caf..7154a28df5c394d503bebf21571aad2a5bb4c15b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -30,4 -30,4 +30,5 @@@ fix_texpfncase_test.patc
  fix-units-path-to-be-multi-arch-safe.patch
  fix_make_files_generation.patch
  fix-IDE-GDB-support.patch
+ clean_man_pages.patch
 +raspbian.diff