Merge version 8.8.4-2+rpi2 and 8.8.4-3 to produce 8.8.4-3+rpi1

diff --cc debian/changelog
index f1ecc0615fae9ec5cf24a9c237a73b2516a5175c,6dd31779633f46545849e2d13baefa1439f25af5..dddb4e99eb01d42920a9b362bf39b03b010a9392
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,12 +1,24 @@@
- ghc (8.8.4-2+rpi2) bookworm-staging; urgency=medium
- 
-   * Add upstream patch to fix build with new autoconf.
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 30 Sep 2021 18:21:04 +0000
- 
- ghc (8.8.4-2+rpi1) bullseye-staging; urgency=medium
++ghc (8.8.4-3+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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 27 Dec 2020 19:30:12 +0000
++  [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.
++
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 09 Oct 2021 20:41:05 +0000
++
+ ghc (8.8.4-3) unstable; urgency=medium
+ 
+   * Disable parallel install to fix races with missing directories
+     (Closes: #944493)
+   * Fix FTBFS with autoconf 2.71. Thanks to Matthias Klose for the patch
+     (Closes: #995036)
+   * Fix FTBFS with Sphinx 4.2.0 (Closes: #995429)
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Sun, 03 Oct 2021 14:27:00 +0300
  
  ghc (8.8.4-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 55cbc5d0283d9b4b6164ce1cc8681818029aba5e,e01ce2e5663638a950e7bc41dd300fa95a262f37..c3981751e6e1ca8d999fa246681f3ffda32aa71e
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -14,4 -14,5 +14,6 @@@ fix-32bit-atomi
  11f8eef5a9625c77f78a829406c446b615ed6168.patch
  haddock-remove-googleapis-fonts
  fix-big-endian-ffi
+ newer-autoconf
+ newer-sphinx
 +autoconf-2.71.patch

diff --cc debian/rules
Simple merge