[SCM] libav/experimental: make libavcodec54/libavcodec-extra-54 properly conflict/replace each other

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0587e61c72e28257d8a97047b60df8700cf9f5c1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 6 10:33:56 2013 +0100

    make libavcodec54/libavcodec-extra-54 properly conflict/replace each other
    
    spotted by lintian

diff --git a/debian/control b/debian/control
index f0a0751..10cdfdb 100644
--- a/debian/control
+++ b/debian/control
@@ -151,8 +151,11 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Conflicts:
+ libavcodec-extra-54
+Replaces:
+ libavcodec-extra-54
 Breaks:
- libavcodec-extra-54,
  mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
 Description: Libav codec library
  Libav is a complete, cross-platform solution to decode, encode, record,
@@ -398,8 +401,9 @@ Depends:
  ${shlibs:Depends}
 Replaces:
  libavcodec54
+Conflicts:
+ libavcodec54
 Breaks:
- libavcodec54,
  mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
 Description: Libav codec library (additional codecs)
  Libav is a complete, cross-platform solution to decode, encode, record,

-- 
Libav/FFmpeg packaging