Merge version 3.0.0+dfsg-11+rpi1 and 3.0.0+dfsg-11+deb9u1 to produce 3.0.0+dfsg-11...

diff --cc debian/changelog
index 46bdf392e7a444e562c0d464435176b6ee6ecf05,9ade9d1a84a1367477438240926e3d4d6a835d0f..e1a70ef4c08a26c55df5b1e899607e39c546b0e4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,21 @@@
++fpc (3.0.0+dfsg-11+rpi1+deb9u1) stretch-staging; urgency=medium
++
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 27 Jul 2017 22:23:03 +0000
++
 +fpc (3.0.0+dfsg-11+rpi1) stretch-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>  Fri, 24 Feb 2017 21:12:43 +0000
 +
+ fpc (3.0.0+dfsg-11+deb9u1) stretch; urgency=medium
+ 
+   * Fix "[fp-units-rtl-3.0.0] Incorrect conversion from local time to
+     UTC". Backported fix from 3.0.2 (Closes: #864148)
+ 
+  -- Abou Al Montacir <abou.almontacir@sfr.fr>  Sat, 10 Jun 2017 19:13:48 +0200
+ 
  fpc (3.0.0+dfsg-11) unstable; urgency=medium
  
    * Team upload

diff --cc debian/patches/series
index 20de36252fd302692bdfe23780468a4a830be9d2,d138f8347d455151fa227060005077c1075cb52d..546e08cac083dc804abed2b137a3f00611afd532
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -39,4 -39,4 +39,5 @@@ further-arm64-fixes.patc
  ppdep-fix-else-handling.patch
  fix-spelling-errors_more.patch
  armhf-fix-vstr-vld-offset.patch
+ Correct-for-different-meaning-of-TZOffset.patch
 +raspbian.diff