[SCM] libav/experimental: Fix some conflicts/replaces

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

The following commit has been merged in the experimental branch:
commit a1e433d445993b65b477949b6d13431c4955f816
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Tue May 15 08:17:16 2012 +0200

    Fix some conflicts/replaces

diff --git a/debian/control b/debian/control
index 14d8a1e..df15e6e 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@ Package: libav-tools
 Section: video
 Architecture: any
 Replaces:
- libavcodec-extra-54 (<< 4:0.6~),
+ libavcodec-extra-53 (<< 4:0.6~),
  libavcodec53 (<< ${source:Version})
 Depends:
  ${misc:Depends},
@@ -185,8 +185,8 @@ Depends:
  ${shlibs:Depends}
 Conflicts:
  libavcodec-extra-54
-Breaks:
- libavcodec-extra-54 (<< 4:0.8.0.2)
+Replaces:
+ libavcodec-extra-54
 Description: Libav codec library
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.

-- 
Libav/FFmpeg packaging