debian/patches: Remove patch to disambiguate between ffmpeg and avconv.

diff --git a/debian/patches/fix_libav_compat_outdated.patch b/debian/patches/fix_libav_compat_outdated.patch
deleted file mode 100644 (file)
index e8a3c52..0000000
--- a/debian/patches/fix_libav_compat_outdated.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Wed, 2 Mar 2016 04:20:06 +1100
-Subject: Stop libav compatibility links from being considered as genuine.
-
-Description: Stop libav compatibility links from being considered as genuine.
- Don't register version numbers for compatibility links, so that
- youtube-dl stops complaining about avconv being outdated.
-Author: Carlos Maddela <e7appew@gmail.com>
-Origin: vendor
-Bug: https://github.com/rg3/youtube-dl/pull/8720
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798936
-Last-Update: 2016-06-27
----
- youtube_dl/postprocessor/ffmpeg.py | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
---- a/youtube_dl/postprocessor/ffmpeg.py
-+++ b/youtube_dl/postprocessor/ffmpeg.py
-@@ -110,11 +110,16 @@
-                 self._paths = dict(
-                     (p, os.path.join(location, p)) for p in programs)
-                 self._versions = dict(
--                    (p, get_exe_version(self._paths[p], args=['-version']))
-+                    (p, get_exe_version(self._paths[p], args=['-version'],
-+                                        version_re=r'%s\s+version\s+([-0-9._a-zA-Z]+)' % p,
-+                                        unrecognized=False))
-                     for p in programs)
-         if self._versions is None:
-             self._versions = dict(
--                (p, get_exe_version(p, args=['-version'])) for p in programs)
-+                (p, get_exe_version(p, args=['-version'],
-+                                    version_re=r'%s\s+version\s+([-0-9._a-zA-Z]+)' % p,
-+                                    unrecognized=False))
-+                for p in programs)
-             self._paths = dict((p, p) for p in programs)
- 
-         if prefer_ffmpeg is False:

diff --git a/debian/patches/series b/debian/patches/series
index 4ea77f5261f79e485bb1007bee92bda7f305cdee..611c3c917b9dc1c55fd408cdb8200337ac887915 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 skip_support_file_installation.patch
 skip_support_file_installation.patch

-fix_libav_compat_outdated.patch

 disable-autoupdate-mechanism.patch
 disable-autoupdate-mechanism.patch