[SCM] FFmpeg packaging branch, master, updated. debian/0.5.1-3-12-g82e4e6f

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 82e4e6f7cabdddab644042fba710d08cd1da794c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 13:33:35 2010 +0200

    add proper replaces for ffpresets move

diff --git a/debian/control b/debian/control
index 4a3611b..4cd67dd 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Build-Depends: debhelper (>= 7),
 
 Package: ffmpeg
 Section: video
+Replaces: libavcodec52 (<< 4:0.5.2-1) | libavcodec-extra-52 (<< 4:0.5.1-3)
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}

-- 
FFmpeg packaging