[SCM] libav/master: Fix upgrade path from earlier versions of the 'ffmpeg' package

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5cb86df82fd13e9ad6bba199838613e2bc24f233
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 15 16:24:50 2012 +0100

    Fix upgrade path from earlier versions of the 'ffmpeg' package
    
    Closes: #655917

diff --git a/debian/control b/debian/control
index 4a80876..fa57774 100644
--- a/debian/control
+++ b/debian/control
@@ -53,11 +53,14 @@ Package: libav-tools
 Section: video
 Architecture: any
 Replaces:
+ ffmpeg (<< 4:0.8~),
  libavcodec-extra-53 (<< 4:0.6~),
  libavcodec53 (<< ${source:Version})
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Breaks:
+ ffmpeg (<< 4:0.8~)
 Conflicts:
  ffprobe
 Description: Multimedia player, server, encoder and transcoder

-- 
Libav/FFmpeg packaging