debian/patch: Refresh all patches to avoid FTBFS.

diff --git a/debian/patches/disable-autoupdate-mechanism.patch b/debian/patches/disable-autoupdate-mechanism.patch
index 8a4d04ba98fa36ab93b3fbc04649f25ddd3a9a09..c64ad7386322ba8ff36338a0abbaf33c3410cd44 100644 (file)
--- a/debian/patches/disable-autoupdate-mechanism.patch
+++ b/debian/patches/disable-autoupdate-mechanism.patch
@@ -15,11 +15,9 @@ Last-Update: 2018-03-16
  youtube_dl/options.py  | 2 +-
  2 files changed, 7 insertions(+), 2 deletions(-)
 
  youtube_dl/options.py  | 2 +-
  2 files changed, 7 insertions(+), 2 deletions(-)
 

-diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
-index 9bb9524..7bf379b 100644

 --- a/youtube_dl/__init__.py
 +++ b/youtube_dl/__init__.py
 --- a/youtube_dl/__init__.py
 +++ b/youtube_dl/__init__.py

-@@ -438,7 +438,12 @@ def _real_main(argv=None):
+@@ -439,7 +439,12 @@

      with YoutubeDL(ydl_opts) as ydl:
          # Update version
          if opts.update_self:
      with YoutubeDL(ydl_opts) as ydl:
          # Update version
          if opts.update_self:


@@ -33,11 +31,9 @@ index 9bb9524..7bf379b 100644
  
          # Remove cache dir
          if opts.rm_cachedir:
  
          # Remove cache dir
          if opts.rm_cachedir:

-diff --git a/youtube_dl/options.py b/youtube_dl/options.py
-index 7d1bbc0..cafca0c 100644

 --- a/youtube_dl/options.py
 +++ b/youtube_dl/options.py
 --- a/youtube_dl/options.py
 +++ b/youtube_dl/options.py

-@@ -140,7 +140,7 @@ def parseOpts(overrideArguments=None):
+@@ -140,7 +140,7 @@

      general.add_option(
          '-U', '--update',
          action='store_true', dest='update_self',
      general.add_option(
          '-U', '--update',
          action='store_true', dest='update_self',

diff --git a/debian/patches/fix_libav_compat_outdated.patch b/debian/patches/fix_libav_compat_outdated.patch
index 0c36990c9d054498d22cef5174fad20e5d551b61..e8a3c52dd5fb35e4acd7025096a64037d3e4a2ad 100644 (file)
--- a/debian/patches/fix_libav_compat_outdated.patch
+++ b/debian/patches/fix_libav_compat_outdated.patch
@@ -14,11 +14,9 @@ Last-Update: 2016-06-27
  youtube_dl/postprocessor/ffmpeg.py | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
  youtube_dl/postprocessor/ffmpeg.py | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 

-diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
-index 3ea1afc..c62256e 100644

 --- a/youtube_dl/postprocessor/ffmpeg.py
 +++ b/youtube_dl/postprocessor/ffmpeg.py
 --- a/youtube_dl/postprocessor/ffmpeg.py
 +++ b/youtube_dl/postprocessor/ffmpeg.py

-@@ -110,11 +110,16 @@ class FFmpegPostProcessor(PostProcessor):
+@@ -110,11 +110,16 @@

                  self._paths = dict(
                      (p, os.path.join(location, p)) for p in programs)
                  self._versions = dict(
                  self._paths = dict(
                      (p, os.path.join(location, p)) for p in programs)
                  self._versions = dict(


@@ -36,4 +34,4 @@ index 3ea1afc..c62256e 100644
 +                for p in programs)
              self._paths = dict((p, p) for p in programs)
  
 +                for p in programs)
              self._paths = dict((p, p) for p in programs)
  

-         if prefer_ffmpeg:
+         if prefer_ffmpeg is False:

diff --git a/debian/patches/skip_support_file_installation.patch b/debian/patches/skip_support_file_installation.patch
index c56cb093bc9163329a1510d86e30b4d8ffd304a3..1fc00a1bb3867c4d5e921cfbe4fd27e3cff983e9 100644 (file)
--- a/debian/patches/skip_support_file_installation.patch
+++ b/debian/patches/skip_support_file_installation.patch
@@ -12,11 +12,9 @@ Last-Update: 2016-06-27
  setup.py | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
 
  setup.py | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
 

-diff --git a/setup.py b/setup.py
-index 7dbb580..80599be 100644

 --- a/setup.py
 +++ b/setup.py
 --- a/setup.py
 +++ b/setup.py

-@@ -58,12 +58,7 @@ py2exe_params = {
+@@ -58,12 +58,7 @@

  if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
      params = py2exe_params
  else:
  if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
      params = py2exe_params
  else: