From 0f965aae28e4cce445cfd0c4302f90b64b09db07 Mon Sep 17 00:00:00 2001 From: Felix Boucher Date: Wed, 14 May 2025 08:56:27 -0400 Subject: [PATCH] control: fix removed packages on debian installer (linuxmint) The debian installer requires libavcodec60 as a dependency, which is already included in linuxmint through libavcodec-extra60, creating a package conflict. Changes to fix this : - also accept libavcodec-extra as a dependency as it includes libavcodec GitLab: #1937 Change-Id: Ia3ab39e6d8bd233414c607ab70fd70af629595b0 --- extras/packaging/gnu-linux/rules/debian-qt/control | 2 +- extras/packaging/gnu-linux/rules/debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/packaging/gnu-linux/rules/debian-qt/control b/extras/packaging/gnu-linux/rules/debian-qt/control index c97e2efe..5a497e92 100644 --- a/extras/packaging/gnu-linux/rules/debian-qt/control +++ b/extras/packaging/gnu-linux/rules/debian-qt/control @@ -261,7 +261,7 @@ Build-Depends: debhelper (>= 9), gperf, khronos-api, # libasound2-dev [linux-any], - libavcodec-dev (>= 7:3.4.8~), + libavcodec-dev (>= 7:3.4.8~) | libavcodec-extra-dev (>= 7:3.4.8~), libavformat-dev (>= 7:3.4.8~), libavutil-dev (>= 7:3.4.8~), libcap-dev [linux-any], diff --git a/extras/packaging/gnu-linux/rules/debian/control b/extras/packaging/gnu-linux/rules/debian/control index 2f44d415..125f4c9a 100644 --- a/extras/packaging/gnu-linux/rules/debian/control +++ b/extras/packaging/gnu-linux/rules/debian/control @@ -30,7 +30,7 @@ Build-Depends: debhelper (>= 9), libspeex-dev, libspeexdsp-dev, uuid-dev, - libavcodec-dev, + libavcodec-dev | libavcodec-extra-dev, libavutil-dev, libavformat-dev, libswscale-dev,