From 5d3ab52b01281f90a3dbb15947ad3227a45bb8c0 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Tue, 22 Nov 2022 13:06:31 +0000 Subject: [PATCH] Drop build-conflicts on pkgconf. --- debian/changelog | 5 +---- debian/control | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index c368bd7..fbd1ec0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,10 +4,7 @@ filament (1.9.25+dfsg2-8+rpi1) bookworm-staging; urgency=medium * Build with clang 11 to hopefully avoid armv7 contamination. * Fix clean target. - [changes introduced in 1.9.25+dfsg2-6 by Peter Michael Green] - * Add build-conflicts on pkgconf (Workaround: #1016922) - - -- Raspbian forward porter Thu, 17 Nov 2022 22:47:53 +0000 + -- Peter Michael Green Tue, 22 Nov 2022 13:05:51 +0000 filament (1.9.25+dfsg2-8) unstable; urgency=medium diff --git a/debian/control b/debian/control index 9228594..d73621f 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,6 @@ Build-Depends: debhelper-compat (= 13), robin-map-dev, spirv-tools, zlib1g-dev, -Build-Conflicts: - pkgconf Homepage: https://github.com/google/filament Standards-Version: 4.6.1 Rules-Requires-Root: no -- 2.30.2