[SCM] libav/master: Remove obsolete Breaks+Replaces+Conflicts

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun May 31 17:36:03 UTC 2015


The following commit has been merged in the master branch:
commit 65f270f9b8b5c664c097ca2261c32773b4afeb51
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue May 26 02:54:24 2015 +0200

    Remove obsolete Breaks+Replaces+Conflicts

diff --git a/debian/control b/debian/control
index e69fb3e..de4869d 100644
--- a/debian/control
+++ b/debian/control
@@ -73,8 +73,6 @@ Depends:
 Suggests:
  frei0r-plugins (>= 1.3),
  x264
-Conflicts:
- ffprobe
 Description: Multimedia player, encoder and transcoder
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.
@@ -93,12 +91,6 @@ Package: libav-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Replaces:
- ffmpeg-dbg (<< 6:0.8.3-5),
- libav-extra-dbg (<< 6:0.8.3-5)
-Breaks:
- ffmpeg-dbg (<< 6:0.8.3-5),
- libav-extra-dbg (<< 6:0.8.3-5)
 Depends:
  libav-tools (= ${binary:Version}),
  libavcodec56 (= ${binary:Version}) | libavcodec-extra-56 (= ${binary:Version}),
@@ -154,8 +146,6 @@ Conflicts:
  libavcodec-extra-56
 Replaces:
  libavcodec-extra-56
-Breaks:
- mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
 Description: Libav codec library
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.
@@ -377,8 +367,6 @@ Replaces:
  libavcodec56
 Conflicts:
  libavcodec56
-Breaks:
- mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
 Description: Libav codec library (additional codecs)
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list