[SCM] ffmpeg/ubuntu.extra: Cleanup after LP #802116, fixes LP: #804452

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.extra branch:
commit 753c476cf99340c92f4dd84ccabdbdd31ca76223
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 1 21:57:38 2011 +0200

    Cleanup after LP #802116, fixes LP: #804452

diff --git a/debian/control b/debian/control
index 53beae4..869b5e8 100644
--- a/debian/control
+++ b/debian/control
@@ -129,8 +129,8 @@ Package: libswscale-extra-2
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Conflicts: libswscale2
-Replaces: libswscale2
+Conflicts: libswscale-extra-1 (>> 4:0.7~), libswscale2
+Replaces: libswscale-extra-1 (>> 4:0.7~), libswscale2
 Description: Libav video scaling library
  This is the video scaling library from the Libav project.
  .

-- 
Libav/FFmpeg packaging