remove build-conflicts on libnuma1

diff --git a/debian/changelog b/debian/changelog
index 5dba5af4143facf5b98b16827895e7bc88dfe404..68c626001c5fe6cdb81d5701c1c898545c41c069 100644 (file)
--- 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 <plugwash@raspbian.org> 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 <plugwash@raspbian.org> 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 <root@raspbian.org>  Sat, 02 Nov 2024 06:04:23 +0000
+ -- Peter Michael Green <plugwash@raspbian.org>  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 7c3467a6c746575b89422407193ac7b9c5bece72..584c5bf7a4dcf740f5e7e549438e1c1efffac221 100644 (file)
--- 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