Merge version 8.0.1-17+rpi1 and 8.0.2-9 to produce 8.0.2-9+rpi1 archive/raspbian/8.0.2-9+rpi1 raspbian/8.0.2-9+rpi1
authorRaspbian forward pporter <root@raspbian.org>
Mon, 4 Sep 2017 14:21:07 +0000 (15:21 +0100)
committerRaspbian forward pporter <root@raspbian.org>
Mon, 4 Sep 2017 14:21:07 +0000 (15:21 +0100)
1  2 
aclocal.m4
compiler/main/SysTools.hs
debian/changelog
debian/patches/series
debian/rules

diff --cc aclocal.m4
Simple merge
Simple merge
index 16228b3845d59351e09f511b40f1ab2eaaf9d8e4,8cf97519dafcb11afdab0b65b7a30d6caa329941..b8a2cf69f50d2754dd6c988b051ee458c3e1e519
@@@ -1,15 -1,75 +1,88 @@@
- ghc (8.0.1-17+rpi1) stretch-staging; urgency=medium
++ghc (8.0.2-9+rpi1) buster-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
 +  * Force llvm cpu and float abi options
 +  [changes introduced in 7.8.4-9+rpi1 by Peter Michael Green]
 +  * no longer set Option "-float-abi=hard" in force-llc-settings, ghc now
 +    sets it without help and setting it twice makes llc fail.
 +  [changed introduced in 7.10.3-2+rpi1 by Peter Michael Green]
 +  * Add call to dh_autoreconf_clean
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 30 Dec 2016 02:30:41 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 04 Sep 2017 14:21:06 +0000
++
+ ghc (8.0.2-9) unstable; urgency=medium
+   * Team upload.
+   * Patch arm64 before autoreconf.
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 26 Aug 2017 19:04:27 +0200
+ ghc (8.0.2-8) unstable; urgency=high
+   * Team upload
+   * Try arm64 with my Ubuntu patch.
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 26 Aug 2017 10:54:27 +0200
+ ghc (8.0.2-7) unstable; urgency=medium
+   * Only apply arm64 linker patch on arm64, to avoid conflict with
+     armel-only patch.
+  -- Clint Adams <clint@debian.org>  Fri, 25 Aug 2017 11:19:17 -0400
+ ghc (8.0.2-6) unstable; urgency=medium
+   * Switch arm64 linker to bfd, since gold is garbage.
+  -- Clint Adams <clint@debian.org>  Fri, 25 Aug 2017 08:36:53 -0400
+ ghc (8.0.2-5) unstable; urgency=medium
+   * Patch from James Clarke to fix powerpc breakage caused by
+     powerpcspe patch.
+  -- Clint Adams <clint@debian.org>  Tue, 27 Jun 2017 07:50:03 -0400
+ ghc (8.0.2-4) unstable; urgency=medium
+   * Revert cross-compilation patch.
+  -- Clint Adams <clint@debian.org>  Sun, 25 Jun 2017 12:38:02 -0400
+ ghc (8.0.2-3) unstable; urgency=medium
+   [ John Paul Adrian Glaubitz ]
+   * Build with --enable-unregisterised on powerpcspe.  closes: #861806.
+   * Support building ghc without building haddock, for cross-compilation.
+     closes: #853285, #853773.
+   [ Helmut Grohne ]
+   * Do not run tests under DEB_BUILD_OPTIONS=nocheck (Closes: #853743).
+   [ Clint Adams ]
+   * Conflict with libghc-cabal-dev (<< 1.24.2.1) to avoid wanna-build
+     confusion.
+  -- Clint Adams <clint@debian.org>  Sun, 25 Jun 2017 10:21:43 -0400
+ ghc (8.0.2-1) unstable; urgency=medium
+   * Team upload
+   * New upstream release, remove patches addressed upstream
+     -add-missing-MO_WriteBarrier
+     -no-pie
+     -find-tycon-panic
+     -get-linker-flags-correctly
+     -fix-ppc-lwa-generation
+     -smp-arm-fix.patch
+     -R_X86_64_REX_GOTPCRELX
+   * Remove old prof_scc.png link on ghc-doc (Closes: #855627)
+   * Bump std-version to 4.0.0
+   * Bump compat level to 10, dropping autoreconf
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 21 Feb 2017 17:07:37 +0100
  
  ghc (8.0.1-17) unstable; urgency=medium
  
index 30e53139262a1a81b5c345749f1ddd779680cb6a,869c9874ffcc53d43d00c215da5d7fbb5b47acd1..ef50c70745c3cd05d851e393623406c28ebfed34
@@@ -5,14 -5,6 +5,7 @@@ hurd.dif
  buildpath-abi-stability.patch
  reproducible-tmp-names
  do-not-use-SHELL
- add-missing-MO_WriteBarrier
- no-pie
- find-tycon-panic
  compiler-cmm-PprC-sparc-alignment.patch
- get-linker-flags-correctly
  x32-use-native-x86_64-insn.patch
- fix-ppc-lwa-generation
  osdecommitmemory-compat.patch
- smp-arm-fix.patch
- R_X86_64_REX_GOTPCRELX
 +force-llc-settings
diff --cc debian/rules
Simple merge