[SCM] ffmpeg/ubuntu: minimize changes to debian

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 6dd94724c214416f00ecb8565b02cc02552e1853
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jul 21 21:14:26 2011 +0200

    minimize changes to debian
    
    forgot this during the last merge

diff --git a/debian/control b/debian/control
index e0c5b01..2ed14fb 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 7),
  libfreetype6-dev,
  libgsm1-dev,
  libimlib2-dev,
- libjack-dev,
+ libjack-dev [!hurd-i386],
  libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libschroedinger-dev,
  libsdl1.2-dev,

-- 
Libav/FFmpeg packaging