[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090204-70-ga3685a2

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a3685a23b94bff230dec812ff7069a7454b48d5b
Author: Fabian Greffrath <fabian at beppo.(none)>
Date:   Sun Feb 8 20:26:10 2009 +0100

    Forgot debian/control.{ffmpeg,ffmpeg-debian}, again...

diff --git a/debian/control.ffmpeg b/debian/control.ffmpeg
index 689de48..dd6c4d8 100644
--- a/debian/control.ffmpeg
+++ b/debian/control.ffmpeg
@@ -1,5 +1,5 @@
 Build-Depends: debhelper (>= 5.0.0),
-               libasound2-dev,
+               libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libfaad-dev | libfaad2-dev,
                libfreetype6-dev,
diff --git a/debian/control.ffmpeg-debian b/debian/control.ffmpeg-debian
index 79e9770..ba9340b 100644
--- a/debian/control.ffmpeg-debian
+++ b/debian/control.ffmpeg-debian
@@ -1,5 +1,5 @@
 Build-Depends: debhelper (>= 5.0.0),
-               libasound2-dev,
+               libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libfaad-dev | libfaad2-dev,
                libfreetype6-dev,

-- 
FFmpeg packaging