[SCM] libav/master: Have both libavcodec and libavcodec-extra package conflict with each other.

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

The following commit has been merged in the master branch:
commit 2decc73f8c01042f6332a5aa3a97d1a87c6ccb8b
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Fri Mar 30 10:15:08 2012 -0400

    Have both libavcodec and libavcodec-extra package conflict with each other.

diff --git a/debian/control b/debian/control
index 0bd75f9..c866920 100644
--- a/debian/control
+++ b/debian/control
@@ -243,6 +243,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Conflicts:
+ libavcodec-extra-53
 Breaks:
  libavcodec-extra-53 (<< 4:0.8.0.2)
 Description: Libav codec library

-- 
Libav/FFmpeg packaging