Imported Debian patch 2011.10.19-2

diff --git a/debian/changelog b/debian/changelog
index 732ca4a531463f42d2b633efb2ee54242f641273..af7d3615118126d84813210ffd181ad8eb10234e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+youtube-dl (2011.10.19-2) unstable; urgency=low
+
+  * Add patch to fix downloading from facebook.
+
+ -- Rogério Brito <rbrito@ime.usp.br>  Sat, 22 Oct 2011 01:16:31 -0200
+
 youtube-dl (2011.10.19-1) unstable; urgency=low
 
   * Imported Upstream version 2011.10.19. Highlights:

diff --git a/debian/patches/0001-Fix-downloading-of-videos-from-facebook.patch b/debian/patches/0001-Fix-downloading-of-videos-from-facebook.patch
new file mode 100644 (file)
index 0000000..a0023e0
--- /dev/null
+++ b/debian/patches/0001-Fix-downloading-of-videos-from-facebook.patch
@@ -0,0 +1,34 @@
+From 4b71bc3cfef0672726beaaa26e1c57c7eca33790 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
+Date: Sat, 22 Oct 2011 01:12:46 -0200
+Subject: [PATCH] Fix downloading of videos from facebook.
+
+---
+ youtube-dl |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/youtube-dl
++++ b/youtube-dl
+@@ -2712,8 +2712,9 @@
+       _VALID_URL = r'^(?:https?://)?(?:\w+\.)?facebook\.com/video/video\.php\?(?:.*?)v=(?P<ID>\d+)(?:.*)'
+       _LOGIN_URL = 'https://login.facebook.com/login.php?m&next=http%3A%2F%2Fm.facebook.com%2Fhome.php&'
+       _NETRC_MACHINE = 'facebook'
+-      _available_formats = ['highqual', 'lowqual']
++      _available_formats = ['video', 'highqual', 'lowqual']
+       _video_extensions = {
++              'video': 'mp4',
+               'highqual': 'mp4',
+               'lowqual': 'mp4',
+       }
+@@ -2741,10 +2742,9 @@
+       def _parse_page(self, video_webpage):
+               """Extract video information from page"""
+               # General data
+-              data = {'title': r'class="video_title datawrap">(.*?)</',
++              data = {'title': r'\("video_title", "(.*?)"\)',
+                       'description': r'<div class="datawrap">(.*?)</div>',
+                       'owner': r'\("video_owner_name", "(.*?)"\)',
+-                      'upload_date': r'data-date="(.*?)"',
+                       'thumbnail':  r'\("thumb_url", "(?P<THUMB>.*?)"\)',
+                       }
+               video_info = {}

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..8961346
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-downloading-of-videos-from-facebook.patch

diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644 (file)
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches