[SCM] FFmpeg packaging branch, ubuntu.jaunty.unstripped, updated. debian/0.svn20081115-1ubuntu1+unstripped1-44-gf0556f0

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.jaunty.unstripped branch:
commit f0556f08d33e684544439958e5ab400871ae5b2b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 1 18:46:03 2009 +0100

    add conflicts/replaces on libavfilter0. LP: #323789

diff --git a/debian/changelog b/debian/changelog
index 461f41c..2f4c05a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ffmpeg (3:0.svn20090119-1ubuntu1+unstripped2) jaunty; urgency=low
+
+  * add conflicts/replaces on libavfilter0. LP: #323789
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sun, 01 Feb 2009 18:45:46 +0100
+
 ffmpeg (3:0.svn20090119-1ubuntu1+unstripped1) jaunty; urgency=low
 
   * merge with the ubuntu.jaunty branch
diff --git a/debian/control b/debian/control
index f4fda3a..cd8191c 100644
--- a/debian/control
+++ b/debian/control
@@ -81,6 +81,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