r1210 - in /unstable/ffmpeg/debian: changelog control

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

Author: fabian-guest
Date: Thu May 29 12:03:14 2008
New Revision: 1210

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1210
Log:
* debian/control:
+ Added Conflicts and Replaces on libavutil-dev (<< 0.svn20080206-7)
to libavcodec-dev (Closes: #483548).


Modified:
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/control

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1210&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Thu May 29 12:03:14 2008
@@ -1,3 +1,11 @@
+ffmpeg-free (0.svn20080206-8) unstable; urgency=low
+
+  * debian/control:
+    + Added Conflicts and Replaces on libavutil-dev (<< 0.svn20080206-7)
+      to libavcodec-dev (Closes: #483548).
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Wed, 29 May 2008 14:02:26 +0200
+
 ffmpeg-free (0.svn20080206-7) unstable; urgency=low
 
   * debian/control:

Modified: unstable/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/control?rev=1210&op=diff
==============================================================================
--- unstable/ffmpeg/debian/control (original)
+++ unstable/ffmpeg/debian/control Thu May 29 12:03:14 2008
@@ -156,8 +156,8 @@
          ${lib1394-dev},
          ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libavformat-dev (<< 0.cvs20060329-4)
-Replaces: libavformat-dev (<< 0.cvs20060329-4)
+Conflicts: libavformat-dev (<< 0.cvs20060329-4), libavutil-dev (<< 0.svn20080206-7)
+Replaces: libavformat-dev (<< 0.cvs20060329-4), libavutil-dev (<< 0.svn20080206-7)
 Description: development files for libavcodec
  This is the codec library from the ffmpeg project. It supports most existing
  encoding formats (MPEG, DivX, MPEG4, AC3, DV...).