[SCM] ffmpeg/master: Take over the libav-tools package

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7edc48cab7e861ae879559fe1374c6c34fd0eaaf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jul 21 07:52:41 2015 -0400

    Take over the libav-tools package
    
    The plan is to fully transition from libav to ffmpeg.

diff --git a/debian/control b/debian/control
index ba48824..e76b51f 100644
--- a/debian/control
+++ b/debian/control
@@ -727,7 +727,7 @@ Description: FFmpeg library for image scaling and various conversions - developm
  .
  This package contains the development files.
 
-Package: libav-tools-links
+Package: libav-tools
 Architecture: all
 Section: oldlibs
 Priority: extra
@@ -735,8 +735,6 @@ Multi-Arch: foreign
 Depends:
  ffmpeg,
  ${misc:Depends}
-Provides: libav-tools
-Conflicts: libav-tools
 Description: Compatibility links for libav-tools (transitional package)
  FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
  mux, demux, stream, filter and play pretty much anything that humans and

-- 
ffmpeg packaging