diff -Nru fpc-3.0.4+dfsg/debian/changelog fpc-3.0.4+dfsg/debian/changelog
--- fpc-3.0.4+dfsg/debian/changelog	2018-03-02 08:13:21.000000000 +0000
+++ fpc-3.0.4+dfsg/debian/changelog	2018-04-22 14:10:23.000000000 +0000
@@ -1,3 +1,26 @@
+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
+
+  * Fixed ppc suffix in fpcmake to be compatible with ppc executable name.
+    For x86_64 architecture, FPC make files build compiler as ppcx64 while
+    fpcmake looks for ppcx86_64 to set default FPCDIR value.
+  * Patched fpcmake to look for FPCDIR in Debian FPC sources location.
+    (Closes: Bug#892285)
+
+ -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sat, 14 Apr 2018 18:08:39 +0200
+
 fpc (3.0.4+dfsg-16) unstable; urgency=medium
 
   * [tests] Update autopkgtest reference files
diff -Nru fpc-3.0.4+dfsg/debian/control fpc-3.0.4+dfsg/debian/control
--- fpc-3.0.4+dfsg/debian/control	2018-01-26 08:45:07.000000000 +0000
+++ fpc-3.0.4+dfsg/debian/control	2018-04-15 09:47:34.000000000 +0000
@@ -24,8 +24,8 @@
  hevea,
  rdfind,
  symlinks
-Vcs-Git: https://anonscm.debian.org/git/pkg-pascal/fpc.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-pascal/fpc.git
+Vcs-Git: https://salsa.debian.org/pascal-team/fpc
+Vcs-Browser: https://salsa.debian.org/pascal-team/fpc
 Homepage: https://www.freepascal.org/
 
 Package: fpc-3.0.4
diff -Nru fpc-3.0.4+dfsg/debian/control.in fpc-3.0.4+dfsg/debian/control.in
--- fpc-3.0.4+dfsg/debian/control.in	2018-01-26 08:45:07.000000000 +0000
+++ fpc-3.0.4+dfsg/debian/control.in	2018-04-15 09:46:49.000000000 +0000
@@ -24,8 +24,8 @@
  hevea,
  rdfind,
  symlinks
-Vcs-Git: https://anonscm.debian.org/git/pkg-pascal/fpc.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-pascal/fpc.git
+Vcs-Git: https://salsa.debian.org/pascal-team/fpc
+Vcs-Browser: https://salsa.debian.org/pascal-team/fpc
 Homepage: https://www.freepascal.org/
 
 Package: fpc${PACKAGESUFFIX}
diff -Nru fpc-3.0.4+dfsg/debian/patches/add-arm64-support.patch fpc-3.0.4+dfsg/debian/patches/add-arm64-support.patch
--- fpc-3.0.4+dfsg/debian/patches/add-arm64-support.patch	2017-10-29 20:47:34.000000000 +0000
+++ fpc-3.0.4+dfsg/debian/patches/add-arm64-support.patch	2018-04-22 14:05:51.000000000 +0000
@@ -36817,7 +36817,7 @@
  
        ppcSuffix : array[TCpu] of string=(
 -        '386','m68k','ppc','sparc','x86_64','arm','ppc64','avr','armeb', 'armel', 'mips', 'mipsel', 'mips64', 'mips64el', 'jvm','8086'
-+        '386','m68k','ppc','sparc','x86_64','arm','ppc64','avr','armeb', 'armel', 'mips', 'mipsel', 'mips64', 'mips64el', 'jvm','8086','aarch64'
++        '386','m68k','ppc','sparc','x64','arm','ppc64','avr','armeb', 'armel', 'mips', 'mipsel', 'mips64', 'mips64el', 'jvm','8086','a64'
        );
  
        OSStr : array[TOS] of string=(
diff -Nru fpc-3.0.4+dfsg/debian/patches/clean_man_pages.patch fpc-3.0.4+dfsg/debian/patches/clean_man_pages.patch
--- fpc-3.0.4+dfsg/debian/patches/clean_man_pages.patch	1970-01-01 00:00:00.000000000 +0000
+++ fpc-3.0.4+dfsg/debian/patches/clean_man_pages.patch	2018-04-15 15:02:00.000000000 +0000
@@ -0,0 +1,17 @@
+Description: Clean man pages to be lintian warnings and erros free.
+ Lintian enforces strict policy on man pages. We try here to fix upsteam files
+ to ensure a lintain rules compatible files..
+Author: Abou Al Montacir <abou.almontacir@sfr.fr>
+
+diff --git a/install/man/man1/fpcjres.1 b/install/man/man1/fpcjres.1
+index ef033a80..6c48d678 100644
+--- a/install/man/man1/fpcjres.1
++++ b/install/man/man1/fpcjres.1
+@@ -1,6 +1,6 @@
+ .TH fpcjres "1" "September 2015" "fpcjres - resource file converter" "User Commands"
+ .SH NAME
+-fpcjres \- manual page for fpcjres: a resource file converter
++fpcjres \- a resource file converter
+ .SH DESCRIPTION
+ fpcjres 
+ This program is called by the free pascal compiler and is used to 
diff -Nru fpc-3.0.4+dfsg/debian/patches/fix-FPCDIR-in-fpcmake.diff fpc-3.0.4+dfsg/debian/patches/fix-FPCDIR-in-fpcmake.diff
--- fpc-3.0.4+dfsg/debian/patches/fix-FPCDIR-in-fpcmake.diff	2017-10-28 20:16:24.000000000 +0000
+++ fpc-3.0.4+dfsg/debian/patches/fix-FPCDIR-in-fpcmake.diff	2018-04-14 16:04:30.000000000 +0000
@@ -60,12 +60,26 @@
                if s<>'' then
                 begin
                   if s[length(s)]='/' then
-@@ -1227,7 +1267,7 @@ implementation
+@@ -1227,7 +1268,21 @@ implementation
              begin
                if FileExists('/usr/bin/ppc' + ppcSuffix[cpu]) then
                 begin
 -                 s:=ExtractFilePath({$ifdef ver1_0}ReadLink{$else}fpReadLink{$endif}('/usr/bin/ppc' + ppcSuffix[cpu]));
 +                 s:=ExtractFilePath(ReadLink('/usr/bin/ppc' + ppcSuffix[cpu], 255));
++                 if s<>'' then
++                  begin
++                    if s[length(s)]='/' then
++                     delete(s,length(s),1);
++                    hs:=SubstVariables('$(wildcard $(addprefix '+s+'/,Makefile.fpc))');
++                  end;
++               end;
++            end;
++           if hs='' then
++            begin
++              s:=ExtractFileName(s);
++              if FileExists('/usr/share/fpcsrc/' + s) then
++               begin
++                 s:=ReadLink('/usr/share/fpcsrc/' + s, 255);
                   if s<>'' then
                    begin
                      if s[length(s)]='/' then
diff -Nru fpc-3.0.4+dfsg/debian/patches/series fpc-3.0.4+dfsg/debian/patches/series
--- fpc-3.0.4+dfsg/debian/patches/series	2018-01-26 08:45:07.000000000 +0000
+++ fpc-3.0.4+dfsg/debian/patches/series	2018-04-15 14:59:01.000000000 +0000
@@ -30,3 +30,4 @@
 fix-units-path-to-be-multi-arch-safe.patch
 fix_make_files_generation.patch
 fix-IDE-GDB-support.patch
+clean_man_pages.patch
diff -Nru fpc-3.0.4+dfsg/debian/rules fpc-3.0.4+dfsg/debian/rules
--- fpc-3.0.4+dfsg/debian/rules	2018-02-14 10:43:14.000000000 +0000
+++ fpc-3.0.4+dfsg/debian/rules	2018-04-15 15:37:59.000000000 +0000
@@ -15,11 +15,13 @@
 DOCTYPE=${DEBDOCTYPE}
 CONVERTER=${DOCTYPE}
 endif
+# Include standard dpkg-buildpackage variables
+include /usr/share/dpkg/architecture.mk
 # Undefine FPC if it was set
 unexport FPC
 # Build new compiler name
-CPU_SOURCE=$(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-CPU_TARGET=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+CPU_SOURCE=${DEB_BUILD_ARCH_CPU}
+CPU_TARGET=${DEB_HOST_ARCH_CPU}
 # Take care that Debian uses amd64 while FPC perfers x86_64 instead
 CPU_SOURCE := $(subst amd64,x86_64,${CPU_SOURCE})
 CPU_TARGET := $(subst amd64,x86_64,${CPU_TARGET})
@@ -72,7 +74,7 @@
 
 PPNEW=$(PPPRE)$(PPSUF)
 # Take care that Debian uses kfreebsd while FPC prefers freebsd
-OS_TARGET=$(subst kfreebsd,freebsd,$(shell dpkg-architecture -qDEB_HOST_ARCH_OS))
+OS_TARGET=$(subst kfreebsd,freebsd,${DEB_HOST_ARCH_OS})
 # FPC uses FPCTARGET to identify the target for which the binaries are
 # produced. This is generally a couple of target CPU and target OS names
 # separated by a dash.
@@ -132,7 +134,6 @@
 
 export GDBLIBDIR=/usr/lib
 
-DEB_HOST_ARCH:=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 ifeq ($(CPU_TARGET),arm)
   # Disable optimization for the first runs as there may be bugs associated
   # with that, preventing proper building new versions (cf bug 800811)
@@ -145,9 +146,6 @@
 endif
 
 # Set default compilation options
-DEB_HOST_MULTIARCH ?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_BUILD_MULTIARCH ?=$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
-
 FPMAKE_BUILDOPTS=FPMAKE_SKIP_CONFIG='-n @${CURDIR}/${DEB_BUILD_FPC_OPT}'
 
 LDFLAGS=$(strip $(shell DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS) \
diff -Nru fpc-3.0.4+dfsg/debian/source/timestamps fpc-3.0.4+dfsg/debian/source/timestamps
--- fpc-3.0.4+dfsg/debian/source/timestamps	2017-10-28 20:16:25.000000000 +0000
+++ fpc-3.0.4+dfsg/debian/source/timestamps	2018-04-22 14:10:23.000000000 +0000
@@ -120,9 +120,29 @@
 fpcsrc/compiler/x86/nx86mem.pas 2017-02-24T10:42+00:00
 fpcsrc/compiler/x86_64/cgcpu.pas 2017-02-24T10:42+00:00
 fpcsrc/compiler/x86_64/cpuelf.pas 2017-02-24T10:42+00:00
+fpcsrc/ide/fp.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/fpcompil.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/fpconst.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/fpdebug.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/fpdesk.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/fpide.pas 2018-04-22T14:12+00:00
 fpcsrc/ide/fpini.pas 2017-02-24T10:42+00:00
 fpcsrc/ide/fpmake.pp 2017-02-24T10:42+00:00
+fpcsrc/ide/fpmopts.inc 2018-04-22T14:12+00:00
+fpcsrc/ide/fpregs.pas 2018-04-22T14:12+00:00
 fpcsrc/ide/fptemplt.pas 2017-02-24T10:42+00:00
+fpcsrc/ide/fpusrscr.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/fpvars.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/fpviews.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/gdbmicon.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/gdbmiint.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/gdbmiproc.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/gdbmiwrap.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/globdir.inc 2018-04-22T14:12+00:00
+fpcsrc/ide/weditor.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/windebug.pas 2018-04-22T14:12+00:00
+fpcsrc/ide/wresourc.pas 2018-04-22T14:12+00:00
+fpcsrc/packages/fcl-js/fpmake.pp 2018-04-22T14:12+00:00
 fpcsrc/packages/fcl-res/src/elfconsts.pp 2017-02-24T10:42+00:00
 fpcsrc/packages/fcl-res/src/elfdefaulttarget.inc 2017-02-24T10:42+00:00
 fpcsrc/packages/fcl-res/src/elfreader.pp 2017-02-24T10:42+00:00
@@ -139,6 +159,7 @@
 fpcsrc/packages/fpmkunit/src/fpmkunit.pp 2017-02-24T10:42+00:00
 fpcsrc/packages/iosxlocale/fpmake.pp 2017-02-24T10:42+00:00
 fpcsrc/packages/iosxlocale/src/iosxwstr.pp 2017-02-24T10:42+00:00
+fpcsrc/packages/ncurses/src/form.pp 2018-04-22T14:12+00:00
 fpcsrc/packages/rtl-extra/src/linux/unixsock.inc 2017-02-24T10:42+00:00
 fpcsrc/packages/rtl-extra/src/unix/ipc.pp 2017-02-24T10:42+00:00
 fpcsrc/rtl/aarch64/aarch64.inc 2017-02-24T10:42+00:00
@@ -153,7 +174,6 @@
 fpcsrc/rtl/arm/arm.inc 2017-02-24T10:42+00:00
 fpcsrc/rtl/arm/thumb2.inc 2017-02-24T10:42+00:00
 fpcsrc/rtl/bsd/ostypes.inc 2017-02-24T10:42+00:00
-fpcsrc/rtl/bsd/sysos.inc 2017-02-24T10:42+00:00
 fpcsrc/rtl/darwin/aarch64/sig_cpu.inc 2017-02-24T10:42+00:00
 fpcsrc/rtl/darwin/aarch64/sighnd.inc 2017-02-24T10:42+00:00
 fpcsrc/rtl/darwin/extres_multiarch.inc 2017-02-24T10:42+00:00
@@ -185,10 +205,11 @@
 fpcsrc/rtl/unix/cthreads.pp 2017-02-24T10:42+00:00
 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/initc.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-04-22T14:12+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-04-22T14:12+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