[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090204-77-g2ad0832

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2ad08326c025f0e96a4ae09a2d2bb97c33bb8773
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 25 07:38:57 2009 +0100

    the new avformat52 now links against libavcodec52, which breaks
    applications that *ALSO* link against libavcodec51. Adding a
    Breaks: libavcodec51 should prevent this and (hopefully) closes: #516885

diff --git a/debian/control b/debian/control
index a0813e7..7cf5a05 100644
--- a/debian/control
+++ b/debian/control
@@ -106,6 +106,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Breaks: libavcodec51
 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...).
diff --git a/debian/control.ffmpeg b/debian/control.ffmpeg
index cfe3f45..b68b1e6 100644
--- a/debian/control.ffmpeg
+++ b/debian/control.ffmpeg
@@ -91,6 +91,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: libavformatcvs52, libavformat52
 Replaces: libavformatcvs52, libavformat52
+Breaks: libavcodec51
 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...).
diff --git a/debian/control.ffmpeg-debian b/debian/control.ffmpeg-debian
index ba9340b..1000358 100644
--- a/debian/control.ffmpeg-debian
+++ b/debian/control.ffmpeg-debian
@@ -93,6 +93,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Breaks: libavcodec51
 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