r1258 - /unstable/ffmpeg/debian/control

[fabian-guest at users.alioth.debian.org]

Author: fabian-guest
Date: Tue Jun 17 07:00:57 2008
New Revision: 1258

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1258
Log:
Added one more conflicting package from Marillat. I hope I got them all, now...

Modified:
    unstable/ffmpeg/debian/control

Modified: unstable/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/control?rev=1258&op=diff
==============================================================================
--- unstable/ffmpeg/debian/control (original)
+++ unstable/ffmpeg/debian/control Tue Jun 17 07:00:57 2008
@@ -228,9 +228,11 @@
 Depends: libavformat52 (= ${binary:Version}),
          libavcodec-dev (= ${binary:Version})
 Conflicts: libavcodec-dev (<< 0.cvs20060306-1),
+           libavformatcvs51-dev,
            libavformatcvs52-dev,
            libavformatcvs-dev
 Replaces: libavcodec-dev (<< 0.cvs20060306-1),
+          libavformatcvs51-dev,
           libavformatcvs52-dev,
           libavformatcvs-dev
 Description: development files for libavformat