[SCM] FFmpeg packaging branch, master.snapshot, updated. debian/0.6.svn20100505-1-8-g670bddd

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit d01595235b38dad15704a0c0f36642f05aa9b3f8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 09:28:50 2010 +0200

    add conflicts to the ffprobe package, it has been merged upstream now

diff --git a/debian/control b/debian/control
index bc6c834..7c6a6c5 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,7 @@ Section: video
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: ffprobe
 Description: multimedia player, server and encoder
  This package contains the ffplay multimedia player, the ffserver streaming
  server and the ffmpeg audio and video encoder. They support most existing

-- 
FFmpeg packaging