Merge version 3.0.4+dfsg-2+rpi1 and 3.0.4+dfsg-11 to produce 3.0.4+dfsg-11+rpi1

diff --cc debian/changelog
index 43678650343f6cbc4754cd915efbcf5eb5f1d88e,3eae339a6dcbf92a376b0046632cc91cd82ed381..97da998ef84073372442ba23277f57300f22a1e2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,64 +1,71 @@@
- fpc (3.0.4+dfsg-2+rpi1) buster-staging; urgency=medium
++fpc (3.0.4+dfsg-11+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, 22 Nov 2017 10:51:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Jan 2018 17:43:42 +0000
++
+ fpc (3.0.4+dfsg-11) unstable; urgency=medium
+ 
+   * Fixed upgrade of fp-utils from older version. (Closes: #885102)
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sat, 30 Dec 2017 21:14:32 +0100
+ 
+ fpc (3.0.4+dfsg-10) unstable; urgency=medium
+ 
+   * Fixed upgrade of fp-utils from older version. (Closes: #885102)
+   * Fixed upstream test suite by generating missing configuration file.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Mon, 25 Dec 2017 20:30:59 +0100
+ 
+ fpc (3.0.4+dfsg-9) unstable; urgency=medium
+ 
+   * Renamed binaries of fp-compiler to <triplet>-* as it is forbidden by
+     policy to have sub-directories in /us/bin.
+   * Moved grab_vcsa from fp-compiler to fp-utils as this is a tool that is
+     not required by the compiler, but by video unit from fp-units-base.
+   * Fixed generation of make files for test suite, including sub directories.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Mon, 18 Dec 2017 23:48:31 +0100
+ 
+ fpc (3.0.4+dfsg-8) unstable; urgency=medium
+ 
+   * Fixed generation of make files for test suite.
+   * Moved binaries of fp-compiler to /usr/bin/<triplet> to be MA compatible.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sat, 16 Dec 2017 23:05:46 +0100
+ 
+ fpc (3.0.4+dfsg-7) unstable; urgency=medium
+ 
+   * Upload to unstable MA related fixes, previously uploaded to exprimental.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Thu, 14 Dec 2017 10:27:15 +0100
+ 
+ fpc (3.0.4+dfsg-6) experimental; urgency=medium
+ 
+   * Fixed issue in postinst/postrm scripts related to unknown env variable.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Thu, 14 Dec 2017 10:25:29 +0100
+ 
+ fpc (3.0.4+dfsg-5) experimental; urgency=medium
+ 
+   * Fixed units installation path according to MA policy.
+   * Bump standards version to 4.1.2 (no changes)
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sat, 09 Dec 2017 00:33:46 +0100
+ 
+ fpc (3.0.4+dfsg-4) experimental; urgency=medium
+ 
+   * Accelerated generation of make files.
+   * Fixed units installation path.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Mon, 04 Dec 2017 23:59:34 +0100
+ 
+ fpc (3.0.4+dfsg-3) experimental; urgency=medium
+ 
+   * Install unit files to a multi-arch safe location.
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Thu, 30 Nov 2017 22:36:25 +0100
  
  fpc (3.0.4+dfsg-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 7f1e2ab4422f19e1e5b236f163380933563308c7,b90dcdc34c8e86b3ac037453335585ee3998c130..6c9933844239c55b718dee25189b31da8b56a8ac
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -27,4 -27,5 +27,6 @@@ remove-depreciated-ncursus-variables-de
  drop-jsminifier-from-build-as-we-strip-it.patch
  create-directory-before-copy-in-Makefile.fpc.patch
  fix_texpfncase_test.patch
+ fix-units-path-to-be-multi-arch-safe.patch
+ fix_make_files_generation.patch
 +raspbian.diff