[SCM] ffmpeg/experimental: Merge qt-faststart back into 'ffmpeg'

[Andreas Cadhalpun]

Hi Reinhard,

thanks for helping with ffmpeg maintenance!

On 12.07.2015 23:38, siretart at users.alioth.debian.org wrote:
> The following commit has been merged in the experimental branch:
> commit bd9acac4d7bb6c336a4b24acacdb05343cfe9bda
> Author: Reinhard Tartler <siretart at tauware.de>
> Date:   Sat Jul 11 12:57:34 2015 -0400
> 
>     Merge qt-faststart back into 'ffmpeg'
>     
>     The libav-tools package is going away, so no point in having
>     that in a separate package. Add proper Replaces relationships.
> 
> diff --git a/debian/control b/debian/control
> index a3fc6f6..21e985f 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -158,7 +158,7 @@ Recommends:
>  Suggests:
>   ffmpeg-doc
>  Breaks: libav-tools (<< 6:9~)
> -Replaces: libav-tools (<< 6:9~)
> +Replaces: libav-tools (<< 6:12~)

Did you intentionally update only the Replaces and not the Breaks?
Policy recommends using both, because otherwise installing and then
removing ffmpeg would remove qt-faststart from libav-tools if that
is installed.

Best regards,
Andreas