From: Raspbian automatic forward porter Date: Sat, 9 Oct 2021 20:41:06 +0000 (+0100) Subject: Merge version 8.8.4-2+rpi2 and 8.8.4-3 to produce 8.8.4-3+rpi1 X-Git-Tag: archive/raspbian/8.8.4-3+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=98d5c11b60cef388afeee5bdb39d68e50c0a3e43;p=ghc.git Merge version 8.8.4-2+rpi2 and 8.8.4-3 to produce 8.8.4-3+rpi1 --- 98d5c11b60cef388afeee5bdb39d68e50c0a3e43 diff --cc debian/changelog index f1ecc061,6dd31779..dddb4e99 --- a/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 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 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 Sun, 27 Dec 2020 19:30:12 +0000 ++ [changes brought forward from 8.8.4-2+rpi2 by Peter Michael Green at Thu, 30 Sep 2021 18:21:04 +0000] ++ * Add upstream patch to fix build with new autoconf. ++ ++ -- Raspbian forward porter 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 Sun, 03 Oct 2021 14:27:00 +0300 ghc (8.8.4-2) unstable; urgency=medium diff --cc debian/patches/series index 55cbc5d0,e01ce2e5..c3981751 --- a/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