diff -Nru ghc-8.8.1+dfsg1+is+8.6.5+dfsg1/debian/changelog ghc-8.8.1+dfsg1+is+8.6.5+dfsg1/debian/changelog --- ghc-8.8.1+dfsg1+is+8.6.5+dfsg1/debian/changelog 2020-03-24 01:50:31.000000000 +0000 +++ ghc-8.8.1+dfsg1+is+8.6.5+dfsg1/debian/changelog 2020-03-27 16:35:29.000000000 +0000 @@ -1,3 +1,12 @@ +ghc (8.8.1+dfsg1+is+8.6.5+dfsg1-3+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 7.6.3-21+rpi1 by Peter Michael Green 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 Fri, 27 Mar 2020 16:35:29 +0000 + ghc (8.8.1+dfsg1+is+8.6.5+dfsg1-3) unstable; urgency=medium * Switch to python3-sphinx; Closes: #943097 diff -Nru ghc-8.8.1+dfsg1+is+8.6.5+dfsg1/debian/patches/ARM-VFPv3D16 ghc-8.8.1+dfsg1+is+8.6.5+dfsg1/debian/patches/ARM-VFPv3D16 --- ghc-8.8.1+dfsg1+is+8.6.5+dfsg1/debian/patches/ARM-VFPv3D16 2020-03-24 01:48:06.000000000 +0000 +++ ghc-8.8.1+dfsg1+is+8.6.5+dfsg1/debian/patches/ARM-VFPv3D16 2020-03-27 16:35:29.000000000 +0000 @@ -13,9 +13,10 @@ @@ -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 ]) ]) diff -Nru ghc-8.8.1+dfsg1+is+8.6.5+dfsg1/debian/rules ghc-8.8.1+dfsg1+is+8.6.5+dfsg1/debian/rules --- ghc-8.8.1+dfsg1+is+8.6.5+dfsg1/debian/rules 2020-03-24 01:48:06.000000000 +0000 +++ ghc-8.8.1+dfsg1+is+8.6.5+dfsg1/debian/rules 2020-03-27 16:35:29.000000000 +0000 @@ -295,6 +295,8 @@ rm -f utils/ghc-pwd/dist-boot/Main.o rm -f utils/ghc-pwd/dist-boot/ghc-pwd + dh_autoreconf_clean + rm -f libraries/haskeline/a.out rm -rf utils/ghctags/dist-install