Imported Debian patch 2015.11.27.1-1.1

diff --git a/debian/changelog b/debian/changelog
index b808c91dfd2e869151fdc87af0735c36ae82da20..020da0916cd50c1012340a716929ee8673ddf404 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+youtube-dl (2015.11.27.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix for youtube failure #809454
+
+ -- Wookey <wookey@debian.org>  Fri, 08 Jan 2016 01:48:02 +0000
+

 youtube-dl (2015.11.27.1-1) unstable; urgency=medium
 
   * Imported Upstream version 2015.11.27.1 (Closes: #806559).
 youtube-dl (2015.11.27.1-1) unstable; urgency=medium
 
   * Imported Upstream version 2015.11.27.1 (Closes: #806559).

diff --git a/debian/patches/fix-809454.patch b/debian/patches/fix-809454.patch
new file mode 100644 (file)
index 0000000..e840a10
--- /dev/null
+++ b/debian/patches/fix-809454.patch
@@ -0,0 +1,21 @@
+Description: Apply youtube fix from upstream issue 7900
+   * Fix for youtube failure #809454
+Author: Wookey <wookey@debian.org>
+
+Origin: upstream, https://github.com/rg3/youtube-dl/commit/b95779be21929c1aed1c0edbc3f9a5d11826973f
+Bug: https://github.com/rg3/youtube-dl/issues/7900
+Bug-Debian: https://bugs.debian.org/809454
+Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809454#3
+Last-Update: 2016-01-07
+
+--- youtube-dl-2015.11.27.1.orig/youtube_dl/jsinterp.py
++++ youtube-dl-2015.11.27.1/youtube_dl/jsinterp.py
+@@ -232,7 +232,7 @@ class JSInterpreter(object):
+     def extract_function(self, funcname):
+         func_m = re.search(
+             r'''(?x)
+-                (?:function\s+%s|[{;]%s\s*=\s*function|var\s+%s\s*=\s*function)\s*
++                (?:function\s+%s|[{;,]%s\s*=\s*function|var\s+%s\s*=\s*function)\s*
+                 \((?P<args>[^)]*)\)\s*
+                 \{(?P<code>[^}]+)\}''' % (
+                 re.escape(funcname), re.escape(funcname), re.escape(funcname)),

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..33a3e48
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-809454.patch