[SCM] ffmpeg/master: Add alternative Depends: libavcodec-ffmpeg-extra56 to libavcodec-dev and ffmpeg-dbg to allow for building and debugging with this library installed.

fabian at users.alioth.debian.org fabian at users.alioth.debian.org
Thu Aug 27 09:48:23 UTC 2015


The following commit has been merged in the master branch:
commit c8f3616a25097bf4f02c703f31e0b38b29d1da2f
Author: Fabian Greffrath <fabian at debian.org>
Date:   Thu Aug 27 11:48:08 2015 +0200

    Add alternative Depends: libavcodec-ffmpeg-extra56 to libavcodec-dev and ffmpeg-dbg to allow for building and debugging with this library installed.

diff --git a/debian/control b/debian/control
index 35c6fc3..05adcce 100644
--- a/debian/control
+++ b/debian/control
@@ -179,7 +179,7 @@ Architecture: any
 Multi-Arch: same
 Depends:
  ffmpeg (= ${binary:Version}),
- libavcodec-ffmpeg56 (= ${binary:Version}),
+ libavcodec-ffmpeg56 (= ${binary:Version}) || libavcodec-ffmpeg-extra56 (= ${binary:Version}),
  libavdevice-ffmpeg56 (= ${binary:Version}),
  libavfilter-ffmpeg5 (= ${binary:Version}),
  libavformat-ffmpeg56 (= ${binary:Version}),
@@ -302,7 +302,7 @@ Multi-Arch: same
 Conflicts:
  libavcodec-libav-dev
 Depends:
- libavcodec-ffmpeg56 (= ${binary:Version}),
+ libavcodec-ffmpeg56 (= ${binary:Version}) || libavcodec-ffmpeg-extra56 (= ${binary:Version}),
  libavutil-dev (= ${binary:Version}),
  libswresample-dev (= ${binary:Version}),
  ${misc:Depends}

-- 
ffmpeg packaging



More information about the pkg-multimedia-commits mailing list