r1117 - in /experimental/ffmpeg/debian: changelog control

[siretart at users.alioth.debian.org]

Author: siretart
Date: Sun Mar 30 20:59:58 2008
New Revision: 1117

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1117
Log:
* add Conflicts/Replaces for libswscale1d.

Modified:
    experimental/ffmpeg/debian/changelog
    experimental/ffmpeg/debian/control

Modified: experimental/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/changelog?rev=1117&op=diff
==============================================================================
--- experimental/ffmpeg/debian/changelog (original)
+++ experimental/ffmpeg/debian/changelog Sun Mar 30 20:59:58 2008
@@ -3,6 +3,7 @@
   * patches/020_fix_sws_scale_crash: if sws_scale is given an invalid context
     (e.g. a null pointer), the function will crash because of a null pointer
     dereference. Add a check for that here.
+  * add Conflicts/Replaces for libswscale1d.
 
  -- Reinhard Tartler <siretart at tauware.de>  Fri, 21 Mar 2008 20:38:00 +0100
 

Modified: experimental/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/control?rev=1117&op=diff
==============================================================================
--- experimental/ffmpeg/debian/control (original)
+++ experimental/ffmpeg/debian/control Sun Mar 30 20:59:58 2008
@@ -116,6 +116,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: libswsacle1d
+Replaces: libswsacle1d
 Description: ffmpeg video scaling library
  This is the video scaling library from the ffmpeg project.
  .