[SCM] FFmpeg packaging branch, master.snapshot, updated. debian/0.6-1-13-g7cf7ddb

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit 7cf7ddbf288fa2b7bbd63af80a38ea34b50faa7c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jun 25 23:39:00 2010 +0200

    add proper replaces for moving presets back to ffmpeg

diff --git a/debian/control b/debian/control
index 2860686..02e06d4 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,8 @@ Build-Depends: debhelper (>= 7),
 Package: ffmpeg
 Section: video
 Architecture: any
+Replaces: libavcodec52 (<< ${source:Version}),
+          libavcodec-extra-52 (<< 4:0.6~)
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: ffprobe

-- 
FFmpeg packaging