Merge version 8.8.1+dfsg1+is+8.6.5+dfsg1-3+rpi1 and 8.8.3-3 to produce 8.8.3-3+rpi1

diff --cc aclocal.m4
Simple merge

diff --cc debian/changelog
index 324e7820c03c31004cde7218f4fea7adcbb10e90,f4c014fc99edfa1f352d1c992b38180d562e376e..4e0a2405944ba0e86bd97a2b8c68ebf23cbe08ed
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,62 +1,71 @@@
- ghc (8.8.1+dfsg1+is+8.6.5+dfsg1-3+rpi1) bullseye-staging; urgency=medium
++ghc (8.8.3-3+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>  Fri, 27 Mar 2020 16:35:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 12 Aug 2020 23:11:38 +0000
++
+ ghc (8.8.3-3) unstable; urgency=medium
+ 
+   * Reupload due to bad debian/rules merge
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 31 Jul 2020 17:48:26 +0200
+ 
+ ghc (8.8.3-2) unstable; urgency=medium
+ 
+   * Cherry-pick Ubuntu patches
+   * Also limit parallel building to 2 on arm64, because Ubuntu fails
+     with ENOMEM with parallel=4
+   * Fix ByteOrder on s390x.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 30 Jul 2020 16:34:22 +0200
+ 
+ ghc (8.8.3-1) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 26 May 2020 09:45:34 -0700
+ 
+ ghc (8.8.3-1~exp2) experimental; urgency=medium
+ 
+   * Patch to remove hs_atomic{read,write}64 from non-64bit systems.
+     This fixes compilation on mipsel and powerpc.
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Sun, 01 Mar 2020 19:01:10 +0200
+ 
+ ghc (8.8.3-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * Do not pass ggc-min-expand=10 on mips64el
+   * Remove unnecessary build-dependency on alex
+   * Replace python-sphinx build-dependency with python3-sphinx
+     (Closes: #943097)
+   * Allow unregisterised ghc-8.6 to build newer GHC
+   * Fix wrong installation of ghc-<version> manpages
+   * Bump compat level to 12
+   * Use the debhelper-compat build-dependency and remove d/compat
+   * Update to llvm-9 (Closes: #912788)
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Fri, 28 Feb 2020 10:56:27 +0200
+ 
+ ghc (8.8.2-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * Upload to experimental.
+   * Bump std-version to 4.5.0, no changes required
+   * Drop the dfsg code, the current version doesn't bundle anymore that
+     library
+   * Apply changes from 8.8.1+dfsg1+is+8.6.5+dfsg1-2
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 28 Jan 2020 08:58:32 +0100
+ 
+ ghc (8.8.1+dfsg2-1~exp1) experimental; urgency=medium
+ 
+   * That one was for experimental, reupload as dfsg2 to bump version
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 12 Sep 2019 08:18:56 +0200
  
  ghc (8.8.1+dfsg1+is+8.6.5+dfsg1-3) unstable; urgency=medium
  

diff --cc debian/patches/ARM-VFPv3D16
index f1fb79e4177224c3a40b75efb671b878a289ba17,3cc266676de3243ff96cae90b80b1816ffa18019..d392be636ddaf851ca06ac0da857d79e15a171f1
--- 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: b/aclocal.m4
+ Index: ghc-8.8.1+dfsg1/aclocal.m4
  ===================================================================
- --- a/aclocal.m4
- +++ b/aclocal.m4
- @@ -454,7 +454,7 @@ AC_DEFUN([GET_ARM_ISA],
+ --- ghc-8.8.1+dfsg1.orig/aclocal.m4
+ +++ ghc-8.8.1+dfsg1/aclocal.m4
+ @@ -454,7 +454,7 @@
                   )],
                   [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
                   ])
           ])

diff --cc debian/rules
Simple merge