[SCM] libav/ubuntu: ffmpeg: update conflicts/replaces on libav-tools

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit a734bfe3164543e36c71f40f83a4cc3a5f9de3ed
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 10 21:52:23 2012 +0200

    ffmpeg: update conflicts/replaces on libav-tools

diff --git a/debian/control b/debian/control
index df39571..7692c17 100644
--- a/debian/control
+++ b/debian/control
@@ -82,9 +82,9 @@ Section: oldlibs
 Priority: extra
 Architecture: any
 Conflicts:
- libav-tools (<< 4:0.8.1-0ubuntu3)
+ libav-tools (<< 4:0.8.3-0ubuntu1)
 Replaces:
- libav-tools (<< 4:0.8.1-0ubuntu3)
+ libav-tools (<< 4:0.8.3-0ubuntu1)
 Depends:
  libav-tools,
  ${misc:Depends},
@@ -421,4 +421,4 @@ Description: Development files for libswscale
  This is the video scaling library from Libav.
  .
  This package contains the header files and static libraries needed to
- compile applications or shared objects that use libswscale.
+ compile applications or shared objects that use libswlibav.

-- 
Libav/FFmpeg packaging