mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-07-04 07:35:26 +02:00
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
This commit is contained in:
parent
f8c29fc4a1
commit
0f965aae28
2 changed files with 2 additions and 2 deletions
|
@ -261,7 +261,7 @@ Build-Depends: debhelper (>= 9),
|
||||||
gperf,
|
gperf,
|
||||||
khronos-api,
|
khronos-api,
|
||||||
# libasound2-dev [linux-any],
|
# 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~),
|
libavformat-dev (>= 7:3.4.8~),
|
||||||
libavutil-dev (>= 7:3.4.8~),
|
libavutil-dev (>= 7:3.4.8~),
|
||||||
libcap-dev [linux-any],
|
libcap-dev [linux-any],
|
||||||
|
|
|
@ -30,7 +30,7 @@ Build-Depends: debhelper (>= 9),
|
||||||
libspeex-dev,
|
libspeex-dev,
|
||||||
libspeexdsp-dev,
|
libspeexdsp-dev,
|
||||||
uuid-dev,
|
uuid-dev,
|
||||||
libavcodec-dev,
|
libavcodec-dev | libavcodec-extra-dev,
|
||||||
libavutil-dev,
|
libavutil-dev,
|
||||||
libavformat-dev,
|
libavformat-dev,
|
||||||
libswscale-dev,
|
libswscale-dev,
|
||||||
|
|
Loading…
Add table
Reference in a new issue