[SCM] libav/ubuntu: dependency fixups

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 35e4cffcdf211a830af0db5f1338d32b4f8f958b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 11 11:26:40 2012 +0200

    dependency fixups

diff --git a/debian/control b/debian/control
index 2a194b5..4a1d46c 100644
--- a/debian/control
+++ b/debian/control
@@ -124,7 +124,7 @@ Breaks:
 Depends:
  ffmpeg (= ${binary:Version}),
  libav-tools (= ${binary:Version}),
- libavcodec53 (= ${binary:Version}) | libavcodec-extra-53 (= ${binary:Version}),
+ libavcodec53 (= ${binary:Version}),
  libavdevice53 (= ${binary:Version}),
  libavformat53 (= ${binary:Version}),
  libavutil51 (= ${binary:Version}),
@@ -202,8 +202,9 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Conflicts:
+ libavcodec-extra-53
 Breaks:
- libavcodec-extra-53,
  mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
 Description: Libav codec library
  Libav is a complete, cross-platform solution to decode, encode, record,
@@ -331,7 +332,7 @@ Section: libdevel
 Architecture: any
 Depends:
  libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}-99),
- libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${binary:Version}),
+ libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
  libavutil-dev (= ${binary:Version}),
  ${misc:Depends}
 Suggests:

-- 
Libav/FFmpeg packaging