Merge version 8.8.3-3+rpi1 and 8.8.4-1 to produce 8.8.4-1+rpi1

diff --cc debian/changelog
index 4e0a2405944ba0e86bd97a2b8c68ebf23cbe08ed,cdee73edb5fec9a4a8c543f6f529f23e042b79d6..7b1bb9163abf8915232f24e8f63853ab7b1a734a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,14 +1,23 @@@
- ghc (8.8.3-3+rpi1) bullseye-staging; urgency=medium
++ghc (8.8.4-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 7.6.3-21+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 19 Apr 2015 14:00:16 +0000]
 +  * Change compiler defaults for armv6
 +  [changed introduced in 7.10.3-2+rpi1 by Peter Michael Green]
 +  * Add call to dh_autoreconf_clean
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 12 Aug 2020 23:11:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 17 Oct 2020 14:42:05 +0000
++
+ ghc (8.8.4-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Fix gen_contents_index to use ghc-pkg to parse the package database
+     (Closes: #966069)
+   * Use locally-installed MathJax.js when generating library docs
+     (Closes: #890627)
+   * Patch Haddock to remove hard-coded googleapis font URL (Closes: #963690)
+   * Backport upstream patch to fix FFI on unregisterised big endian machines
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Tue, 11 Aug 2020 17:12:43 +0300
  
  ghc (8.8.3-3) unstable; urgency=medium
  

diff --cc debian/patches/ARM-VFPv3D16
index d392be636ddaf851ca06ac0da857d79e15a171f1,f979c7358bf65c7c316916f17dd41ca0bc7b07b1..f1fb79e4177224c3a40b75efb671b878a289ba17
--- 1/debian/patches/ARM-VFPv3D16
--- 2/debian/patches/ARM-VFPv3D16
+++ b/debian/patches/ARM-VFPv3D16
@@@ -6,17 -6,16 +6,17 @@@ Author: Jani Monoses <jani@ubuntu.com
  Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
  Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
  
- Index: ghc-8.8.1+dfsg1/aclocal.m4
+ Index: b/aclocal.m4
  ===================================================================
- --- ghc-8.8.1+dfsg1.orig/aclocal.m4
- +++ ghc-8.8.1+dfsg1/aclocal.m4
- @@ -454,7 +454,7 @@
+ --- a/aclocal.m4
+ +++ b/aclocal.m4
+ @@ -454,7 +454,7 @@ AC_DEFUN([GET_ARM_ISA],
                   )],
                   [changequote(, )dnl
 -                  ARM_ISA=ARMv7
 +-                 ARM_ISA=ARMv7
 ++                 ARM_ISA=ARMv6
  -                 ARM_ISA_EXT="[VFPv3,NEON]"
 -+                 ARM_ISA_EXT="[VFPv3D16,NEON]"
 ++                 ARM_ISA_EXT="[VFPv2]"
                    changequote([, ])dnl
                   ])
           ])