[SCM] FFmpeg packaging branch, ubuntu.karmic.extra, updated. debian/0.5+svn20090706-2ubuntu1-18-g04af716

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.karmic.extra branch:
commit 789d0795c354697eda00974117adc67d3eb43e70
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 14 07:53:25 2009 +0200

    add extra Conflicts/Replaces, LP: #418785

diff --git a/debian/control b/debian/control
index 6b4ea14..455c516 100644
--- a/debian/control
+++ b/debian/control
@@ -51,8 +51,8 @@ Package: libavutil-extra-49
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libavutilcvs49, libavutil49
-Replaces: libavutilcvs49, libavutil49
+Conflicts: libavutilcvs49, libavutil49, libavutil-unstripped-49
+Replaces: libavutilcvs49, libavutil49, libavutil-unstripped-49
 Description: ffmpeg utility library
  This is the common utility library from the ffmpeg project. It is required
  by all other ffmpeg libraries.
@@ -71,8 +71,8 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: libfaad0
-Conflicts: libavcodec52
-Replaces: libavcodec52
+Conflicts: libavcodec52, libavcodec-unstripped-52
+Replaces: libavcodec52, libavcodec-unstripped-52
 Description: ffmpeg codec library
  This is the codec library from the ffmpeg project. It supports most existing
  encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
@@ -90,8 +90,8 @@ Package: libavdevice-extra-52
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libavdevicecvs52, libavdevice52
-Replaces: libavdevicecvs52, libavdevice52
+Conflicts: libavdevicecvs52, libavdevice52, libavdevice-unstripped-52
+Replaces: libavdevicecvs52, libavdevice52, libavdevice-unstripped-52
 Description: ffmpeg device handling library
  This is the device handling library from the ffmpeg project.
  .
@@ -108,8 +108,8 @@ Package: libavfilter-extra-0
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libavfilter0
-Replaces: libavfilter0
+Conflicts: libavfilter0, libavfilter-unstripped-0
+Replaces: libavfilter0, libavfilter-unstripped-0
 Description: ffmpeg video filtering library
  This is the video filtering library from the ffmpeg project.
  .
@@ -128,8 +128,8 @@ Package: libpostproc-extra-51
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libpostproccvs51, libpostproc51
-Replaces: libpostproccvs51, libpostproc51
+Conflicts: libpostproccvs51, libpostproc51, libpostproc-unstripped-51
+Replaces: libpostproccvs51, libpostproc51, libpostproc-unstripped-51
 Description: ffmpeg video postprocessing library
  This is the video postprocessing library from the ffmpeg project.
  .
@@ -146,8 +146,8 @@ Package: libavformat-extra-52
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libavformatcvs52, libavformat52
-Replaces: libavformatcvs52, libavformat52
+Conflicts: libavformatcvs52, libavformat52, libavformat-unstripped-52
+Replaces: libavformatcvs52, libavformat52, libavformat-unstripped-52
 Breaks: libavcodec51
 Description: ffmpeg file format library
  This is the demuxer library from the ffmpeg project. It supports most
@@ -166,8 +166,8 @@ Package: libswscale-extra-0
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libswscalecvs0, libswscale0
-Replaces: libswscalecvs0, libswscale0
+Conflicts: libswscalecvs0, libswscale0, libswscale-unstripped-0
+Replaces: libswscalecvs0, libswscale0, libswscale-unstripped-0
 Description: ffmpeg video scaling library
  This is the video scaling library from the ffmpeg project.
  .

-- 
FFmpeg packaging