[SCM] ffmpeg/ubuntu.extra: Imported Debian patch 0.6-2ubuntu3

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.extra branch:
commit ffd85fd0085e0a194d79bba63a6d4fc155c58571
Author: Dominic Evans <oldmanuk at gmail.com>
Date:   Fri Sep 10 14:21:23 2010 +0100

    Imported Debian patch 0.6-2ubuntu3

diff --git a/debian/changelog b/debian/changelog
index 87ddb87..b530f4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ffmpeg (4:0.6-2ubuntu3) maverick; urgency=low
+
+  * add libxfixes-dev to build-depends, LP: #631103
+
+ -- Dominic Evans <oldmanuk at gmail.com>  Fri, 10 Sep 2010 14:21:23 +0100
+
 ffmpeg (4:0.6-2ubuntu2) maverick; urgency=low
 
   * weaken the dependencies for the -extra package
diff --git a/debian/control b/debian/control
index d978eef..22d0334 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Build-Depends: debhelper (>= 7),
                libvorbis-dev,
                libx11-dev,
                libxext-dev,
+               libxfixes-dev,
                libvdpau-dev,
                libvpx-dev,
                libxvmc-dev,

-- 
FFmpeg packaging