[SCM] FFmpeg packaging branch, master.extra, updated. debian/0.5+svn20090609-2debimedia1

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.extra branch:
commit cf4cebbb985a979866469b174987d4745b36ea9f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 1 22:37:38 2009 +0200

    add conflicts/replaces fields on libavfilter-extra-0 package

diff --git a/debian/control b/debian/control
index c870db3..2e73c0c 100644
--- a/debian/control
+++ b/debian/control
@@ -105,6 +105,8 @@ Package: libavfilter-extra-0
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: libavfilter0
+Replaces: libavfilter0
 Description: ffmpeg video filtering library
  This is the video filtering library from the ffmpeg project.
  .
@@ -113,6 +115,8 @@ Description: ffmpeg video filtering library
 
 Package: libavfilter-unstripped-0
 Architecture: any
+Conflicts: libavfilter0
+Replaces: libavfilter0
 Depends: libavfilter-extra-0 (= ${binary:Version})
 Description: ffmpeg utility library - transitional package
  This package can be safely removed if no other packages depend on this

-- 
FFmpeg packaging