[SCM] ffmpeg/master-0.6: Use proper architecture wildcards for Linux-only dependencies, Closes: #634460

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Thu Jul 21 13:48:18 UTC 2011


The following commit has been merged in the master-0.6 branch:
commit 7207046770ffbc37bd59177699a9f5e2e9d2af56
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jul 19 07:49:07 2011 +0200

    Use proper architecture wildcards for Linux-only dependencies, Closes: #634460
    
    Thanks to  Robert Millan <rmh at debian.org> for reporting.
    (cherry picked from commit 4895df159eda662758dd851fe4b9554a1d43d1c9)

diff --git a/debian/control b/debian/control
index 8c1266c..df0a990 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libav.git;a=summary
 Homepage: http://libav.org/
 Build-Depends-Indep: doxygen
 Build-Depends: debhelper (>= 7),
- libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libasound2-dev [linux-any],
  libbz2-dev,
- libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libdc1394-22-dev [linux-any],
  libdirac-dev,
  libfaad-dev | libfaad2-dev,
  libfreetype6-dev,
@@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 7),
  libimlib2-dev,
  libjack-dev,
  libopenjpeg-dev,
- libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libraw1394-dev [linux-any],
  librtmp-dev (>= 2.2e-4),
  libschroedinger-dev,
  libsdl1.2-dev,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list