From d025505d1fd3ef862a2098dd2be9ed03ec13f528 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sat, 2 Nov 2024 07:48:29 +0000 Subject: [PATCH] remove build-conflicts on libnuma1 --- debian/changelog | 5 +---- debian/control | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5dba5af4..68c62600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,13 +6,10 @@ ghc (9.6.6-2+rpi1) trixie-staging; urgency=medium [changes brought forward from 9.0.2-4+rpi2 by Peter Michael Green at Tue, 04 Oct 2022 05:00:41 +0000] * Add build-conflicts on libllvm14 - [changes brought forward from 9.0.2-4+rpi3 by Peter Michael Green at Wed, 05 Oct 2022 13:33:13 +0000] - * Add build conflicts on libnuma1 - [changes introduced in 9.4.7-2+rpi1 by Peter Michael Green] * replace dmb instruction with coprocessor barrier instruction. - -- Raspbian forward porter Sat, 02 Nov 2024 06:04:23 +0000 + -- Peter Michael Green Sat, 02 Nov 2024 06:04:23 +0000 ghc (9.6.6-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 7c3467a6..584c5bf7 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends: Build-Depends-Indep: hscolour, python3-sphinx-rtd-theme, -Build-Conflicts: ccache, libllvm14, libnuma1 +Build-Conflicts: ccache, libllvm14 Homepage: https://haskell.org/ghc/ Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/ghc] Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/ghc -- 2.30.2