Merge version 9.6.6-2+rpi1 and 9.6.6-4 to produce 9.6.6-4+rpi1 trixie-staging archive/raspbian/9.6.6-4+rpi1 raspbian/9.6.6-4+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Sat, 8 Mar 2025 09:38:07 +0000 (09:38 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Sat, 8 Mar 2025 09:38:07 +0000 (09:38 +0000)
1  2 
debian/changelog
debian/control
debian/patches/series

index 68c626001c5fe6cdb81d5701c1c898545c41c069,49d17cc3efe31b617d5d85b85f5ff4fb3b136a46..329f08e34be26d4a5267935c69f229cfe8a640f8
@@@ -1,15 -1,25 +1,38 @@@
- ghc (9.6.6-2+rpi1) trixie-staging; urgency=medium
++ghc (9.6.6-4+rpi1) trixie-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
 +
 +  [changes brought forward from 9.0.2-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 04 Oct 2022 05:00:41 +0000]
 +  * Add build-conflicts on libllvm14
 +
 +  [changes introduced in 9.4.7-2+rpi1 by Peter Michael Green]
 +  * replace dmb instruction with coprocessor barrier instruction.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 02 Nov 2024 06:04:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 08 Mar 2025 09:38:06 +0000
++
+ ghc (9.6.6-4) unstable; urgency=medium
+   [ John Paul Adrian Glaubitz ]
+   * Add patch to fix FTBFS on alpha (Closes#: 1086830)
+   [ Gianfranco Costamagna ]
+   * Add binutils-gold to armel and armhf, according to rules file
+     (Closes: #1094995)
+   [ 王鑫 <wangxin03@loongson.cn> ]
+   * Update loongarch64 patch with new upstream backported commits
+    (Closes: #1089921)
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 17 Feb 2025 09:44:23 +0100
+ ghc (9.6.6-3) unstable; urgency=medium
+   [ fanpeng <fanpeng@loongson.cn> ]
+   * debian/patches/7e2d3eb507da184cf3337d36715fd82a81643d91.patch:
+     - upstream fix for loong64 build failures (Closes: #1085966)
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 06 Nov 2024 00:21:23 +0100
  
  ghc (9.6.6-2) unstable; urgency=medium
  
diff --cc debian/control
Simple merge
index 707c40df8d680f10b748dd2689c56c872f143071,3054af88b3e6b5ec6299ff94b7953b0a729a6b2d..602f904940500f4bc6902b433238c1c2b415ae2e
@@@ -27,4 -27,8 +27,9 @@@ llvm-new-pass-manage
  llvm-newer-version
  hadrian-plans
  pr-13096
+ alpha-fix-ieee_set_fp_control-invocation.patch
+ 0001-llvmGen-Add-export-list-to-GHC.Llvm.MetaData.patch
+ 0002-llvmGen-Allow-LlvmLits-in-MetaExprs.patch
+ 0003-llvmGen-Introduce-infrastructure-for-module-flag-metadata.patch
+ 0004-llvmGen-Pass-mcmodel-medium-option-to-LLVM-backend-on-LoongArch.patch
 +replace-dmb-instruction-with-coprocessor.patch