[SCM] FFmpeg packaging branch, ubuntu, updated. debian/0.6.svn20100505-1ubuntu2

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 0819f778e886548776499e40fe18d3597f5f6981
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 11:30:17 2010 +0200

    add proper replaces, fixes: LP: #587369

diff --git a/debian/control b/debian/control
index e8b73cd..1413279 100644
--- a/debian/control
+++ b/debian/control
@@ -39,6 +39,8 @@ Build-Depends: debhelper (>= 7),
 Package: ffmpeg
 Section: video
 Architecture: any
+Replaces: libavcodec52 (<< ${source:Version}),
+          libavcodec-extra-52 (<< 4:0.6~svn20100505-1ubuntu1)
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: multimedia player, server and encoder

-- 
FFmpeg packaging