[SCM] libav/ubuntu: add conflicts/replaces for ffmpeg transitional package

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 297ef6ef664a1de93ed781b6bb30de6751362104
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 10 11:49:54 2012 +0200

    add conflicts/replaces for ffmpeg transitional package

diff --git a/debian/control b/debian/control
index 18c7596..0b5d111 100644
--- a/debian/control
+++ b/debian/control
@@ -79,6 +79,10 @@ Package: ffmpeg
 Section: oldlibs
 Priority: extra
 Architecture: any
+Conflicts:
+ libav-tools (<< 4:0.8.1-0ubuntu3)
+Replaces:
+ libav-tools (<< 4:0.8.1-0ubuntu3)
 Depends:
  libav-tools,
  ${misc:Depends},

-- 
Libav/FFmpeg packaging