[SCM] FFmpeg packaging branch, master.snapshot, updated. debian/0.6-2-15-g2851757

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit 2851757ff0598fd49cdb58c10f66d3b74e610dc0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Sep 2 15:37:29 2010 +0200

    Force upgrades of pre-rc4 versions of the mplayer package (Closes: #595241)
    
    mplayer traditionally uses some ffmpeg internals and mplayer rc4 is the
    first version of mplayer that is compatible with FFmpeg 0.6

diff --git a/debian/control b/debian/control
index 44478bf..a650136 100644
--- a/debian/control
+++ b/debian/control
@@ -117,6 +117,7 @@ Package: libavformat52
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Breaks: mplayer (<< 2:1.0~rc4)
 Description: ffmpeg file format library
  This is the demuxer library from the ffmpeg project. It supports most
  existing file formats (AVI, MPEG, OGG, Matroska, ASF...).

-- 
FFmpeg packaging