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

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

Author: fabian-guest
Date: Mon May 19 14:53:36 2008
New Revision: 1188

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1188
Log:
* debian/control:
+ Fixed dependency typo, libswscale0 conflicts with libswsacle1d but not
libswscale1d (Closes: #481908).


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=1188&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Mon May 19 14:53:36 2008
@@ -1,3 +1,11 @@
+ffmpeg-free (0.svn20080206-5) UNRELEASED; urgency=low
+
+  * debian/control:
+    + Fixed dependency typo, libswscale0 conflicts with libswsacle1d but not
+      libswscale1d (Closes: #481908).
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Thu, 15 May 2008 22:27:54 +0200
+
 ffmpeg-free (0.svn20080206-4) unstable; urgency=low
 
   * debian/rules:

Modified: unstable/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/control?rev=1188&op=diff
==============================================================================
--- unstable/ffmpeg/debian/control (original)
+++ unstable/ffmpeg/debian/control Mon May 19 14:53:36 2008
@@ -118,8 +118,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libswsacle1d
-Replaces: libswsacle1d
+Conflicts: libswscale1d
+Replaces: libswscale1d
 Description: ffmpeg video scaling library
  This is the video scaling library from the ffmpeg project.
  .