[SCM] FFmpeg packaging branch, ubuntu.jaunty.unstripped, updated. debian/0.svn20090204-2ubuntu1+unstripped3

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.jaunty.unstripped branch:
commit 6a3faf9b3338b415d96b949167145745fbde6544
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Mar 9 18:27:25 2009 +0100

    add conflicts replaces for libavfilter0, LP: #322570

diff --git a/debian/changelog b/debian/changelog
index 1fde8f9..b443eb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ffmpeg (3:0.svn20090204-2ubuntu1+unstripped3) jaunty; urgency=low
+
+  * add conflicts replaces for libavfilter0, LP: #322570
+
+ -- Reinhard Tartler <siretart at tauware.de>  Mon, 09 Mar 2009 18:24:56 +0100
+
 ffmpeg (3:0.svn20090204-2ubuntu1+unstripped2) jaunty; urgency=low
 
   * add correct epoch in the "internal" shlibs generation
diff --git a/debian/control b/debian/control
index 39ad55f..4ab9378 100644
--- a/debian/control
+++ b/debian/control
@@ -83,6 +83,8 @@ Section: libs
 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.
  .
diff --git a/debian/control.ffmpeg b/debian/control.ffmpeg
index 740b128..abaaed0 100644
--- a/debian/control.ffmpeg
+++ b/debian/control.ffmpeg
@@ -70,6 +70,8 @@ Section: libs
 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.
  .

-- 
FFmpeg packaging