[SCM] ffmpeg/ubuntu: remove unnecessary replaces/breaks

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Nov 14 19:23:55 UTC 2010


The following commit has been merged in the ubuntu branch:
commit 124f00be0188723216c62621fe041b1c9f586988
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 17:21:31 2010 +0100

    remove unnecessary replaces/breaks
    
    this minimizes the diff to debian

diff --git a/debian/control b/debian/control
index 4b4a15b..a2e0086 100644
--- a/debian/control
+++ b/debian/control
@@ -93,7 +93,6 @@ Package: libavcodec52
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Replaces: ffmpeg (<< 4:0.5.1-1)
 Breaks: libavcodec51 (<< 3:0.svn20090303-1)
 Description: ffmpeg codec library
  This is the codec library from the ffmpeg project. It supports most existing
@@ -116,7 +115,7 @@ Package: libavformat52
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Breaks: libavcodec51 (<< 3:0.svn20090303-1), mplayer (<< 2:1.0~rc4)
+Breaks: mplayer (<< 2:1.0~rc4)
 Description: ffmpeg file format library
  This is the demuxer library from the ffmpeg project. It supports most
  existing file formats (AVI, MPEG, OGG, Matroska, ASF...).

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list