[SCM] ffmpeg/ubuntu: Conflicts/Replaces against broken libswscale-extra-1 package, LP: #804452

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 5f08de4af3319877201044c55d54363d04941b2e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jul 6 15:28:39 2011 +0200

    Conflicts/Replaces against broken libswscale-extra-1 package, LP: #804452

diff --git a/debian/control b/debian/control
index 4b01eb7..399c20d 100644
--- a/debian/control
+++ b/debian/control
@@ -174,6 +174,8 @@ Package: libswscale2
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
+Conflicts: libswscale-extra-1 (>> 4:0.7~)
+Replaces: libswscale-extra-1 (>> 4:0.7~)
 Description: Libav video scaling library
  This is the video software scaling library from Libav.
 

-- 
Libav/FFmpeg packaging