Manual merge of version 8.8.4-3+rpi1 and 9.0.2-4 to produce 9.0.2-4+rpi1

diff --cc debian/changelog
index dddb4e99eb01d42920a9b362bf39b03b010a9392,60aba4fd4d8687c1f3a82697f69607078bd04a08..29ced35fd3d31c0ba07262c129ee3ca11a8da725
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,115 +1,124 @@@
- ghc (8.8.4-3+rpi1) bookworm-staging; urgency=medium
++ghc (9.0.2-4+rpi1) bookworm-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
 +
-   [changes brought forward from 8.8.4-2+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 30 Sep 2021 18:21:04 +0000]
-   * Add upstream patch to fix build with new autoconf.
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 01 Oct 2022 14:07:03 +0000
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 09 Oct 2021 20:41:05 +0000
+ ghc (9.0.2-4) unstable; urgency=medium
+ 
+   * Backport patch to fix ABI reproducibility (Closes: #1015733)
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Sat, 24 Sep 2022 10:06:11 +0300
+ 
+ ghc (9.0.2-3) unstable; urgency=medium
+ 
+   * Declare compliance with Debian policy 4.6.1
+   * Separate the binary-all/binary-any builds (Closes: #1014066)
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Fri, 15 Jul 2022 17:03:35 +0300
+ 
+ ghc (9.0.2-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Tue, 21 Jun 2022 19:57:57 +0300
+ 
+ ghc (9.0.2-1exp1) experimental; urgency=medium
+ 
+   * Cherry-pick two upstream changes to build with llvm-13 on arm*
+     - debian/patches/78db231ffdf8385662812781c1d09c630cfad313.patch:
+     - debian/patches/ddd2591c5ca395e39ea36855e5b7e0a3464b7ad8.patch:
+   * Update to llvm-13 (Closes: #1000929)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 10 Jun 2022 15:39:19 +0200
+ 
+ ghc (9.0.2-1) unstable; urgency=medium
+ 
+   * Upload to unstable.
+   * Remove Joachim Breitner from uploaders.
+   * Drop libncurses5-dev dep in favor of libncurses-dev (Closes: #998348).
+   * Update to llvm-12 (Closes: #1000929).
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Fri, 10 Jun 2022 12:49:38 +0300
+ 
+ ghc (9.0.2-1~exp1) experimental; urgency=medium
+ 
+   [ Gianfranco Costamagna ]
+   * Revert last change on mipsel, didn't fix the failure
+ 
+   [ Ilias Tsitsimpis ]
+   * New upstream release.
+   * Refresh patches.
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Fri, 03 Jun 2022 11:25:00 +0300
+ 
+ ghc (8.10.7-1~exp2) experimental; urgency=medium
+ 
+   * Lower parallelism builds to 2 on mipsel
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 21 Jan 2022 11:20:56 +0100
+ 
+ ghc (8.10.7-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Add upstream GPG key used to sign the tarballs.
+   * Drop patches applied upstream.
+   * Refresh and re-enable 'fix-big-endian-ffi' patch.
+   * Fix compilation on armel.
+   * Fix linker relocation errors on mips64el.
+   * Switch to unregistered build on i386 to avoid a baseline violation.
+     Thanks to Adrian Bunk for the patch.
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Sun, 24 Oct 2021 15:03:50 +0300
+ 
+ ghc (8.10.6-1~exp4) experimental; urgency=medium
+ 
+   * Drop some patches now upstream.
+   * Add a patch from Fedora to avoid too much logs on s390x.
+   * Enable unregisterised builds on s390x
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 26 Aug 2021 12:00:34 +0200
+ 
+ ghc (8.10.4-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 14 Feb 2021 11:02:03 +0100
+ 
+ ghc (8.10.3-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 24 Dec 2020 23:10:52 +0100
+ 
+ ghc (8.10.2-1~exp3) experimental; urgency=medium
+ 
+   * Upload to experimental with changes from 8.8.4-2
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 23 Dec 2020 23:20:54 +0100
+ 
+ ghc (8.10.2-1~exp2) experimental; urgency=medium
+ 
+   * Drop FFI patch, makes the package FTBFS everywhere
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 19 Aug 2020 21:32:42 +0200
+ 
+ ghc (8.10.2-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 18 Aug 2020 15:11:31 +0200
+ 
+ ghc (8.10.1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * Drop llvm-9 patch: upstream
+   * Also reduce parallel builds on arm64
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 27 May 2020 17:46:58 +0200
  
  ghc (8.8.4-3) unstable; urgency=medium
  

diff --cc debian/patches/ARM-VFPv3D16
index f1fb79e4177224c3a40b75efb671b878a289ba17,2c356771e12e816db23876ebf38ec9a84c6cd816..adfe22e37c95e7d69ab3d17d5862645da43a8f42
--- 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: b/m4/fptools.m4
  ===================================================================
- --- a/aclocal.m4
- +++ b/aclocal.m4
- @@ -454,7 +454,7 @@ AC_DEFUN([GET_ARM_ISA],
+ --- a/m4/fptools.m4
+ +++ b/m4/fptools.m4
+ @@ -475,7 +475,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
                   ])
           ])

diff --cc debian/rules
Simple merge