Merge version 8.8.4-1+rpi1 and 8.8.4-2 to produce 8.8.4-2+rpi1

diff --cc debian/changelog
index 7b1bb9163abf8915232f24e8f63853ab7b1a734a,7a9878936ad3e517751a35a63cc8da8ef5d1f965..6b885e1b1ad7eeb71a2309b1dfdefffc25d85513
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,17 +1,26 @@@
- ghc (8.8.4-1+rpi1) bullseye-staging; urgency=medium
++ghc (8.8.4-2+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>  Sat, 17 Oct 2020 14:42:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 27 Dec 2020 19:30:12 +0000
++
+ ghc (8.8.4-2) unstable; urgency=medium
+ 
+   [ Ilias Tsitsimpis ]
+   * Correctly set 'haddock-interfaces' for base libraries (Closes: #968446)
+   * Remove files generated by postinst script (Closes: #909922)
+   * Add myself as an uploader
+ 
+   [ Gianfranco Costamagna ]
+   * Lower parallel builds to 2 on Ubuntu armhf, to speed up build process.
+ 
+   [ Adrian Bunk ]
+   * Update to llvm-11. (Closes: #974794)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 23 Dec 2020 23:15:42 +0100
  
  ghc (8.8.4-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge