Imported Debian patch 2007.08.24-1

diff --combined debian/changelog
index 47eb40e066caffb41a3089a7700fb4f1a4a6d026,0000000000000000000000000000000000000000..97c94a2d60f8770ec866987a84bbeb20a67e4a05
mode 100644,000000..100644
--- 1/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@@ -1,64 -1,0 +1,70 @@@
++youtube-dl (2007.08.24-1) unstable; urgency=low
++
++  * New upstream release; closes: #439363.
++
++ -- Robert S. Edmonds <edmonds@debian.org>  Fri, 24 Aug 2007 13:54:40 -0400
++
 +youtube-dl (2007.06.22-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - regex update.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Thu, 21 Jun 2007 20:42:57 -0400
 +
 +youtube-dl (2007.06.06-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - "--title-too" command line option to print the video's title.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Thu, 07 Jun 2007 01:04:01 -0400
 +
 +youtube-dl (2007.03.27-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - Progress meter.
 +    - "--literal" command line option to use the video title in the filename.
 +    - "--get-url" command line option to print the real video URL.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Mon,  2 Apr 2007 21:46:56 -0400
 +
 +youtube-dl (2007.02.18-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - Diction.
 +    - Catches socket errors.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Tue, 20 Feb 2007 13:57:32 -0500
 +
 +youtube-dl (2007.01.19-1) unstable; urgency=low
 +
 +  * New upstream release, closes: #406146.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Sun, 28 Jan 2007 17:41:44 -0500
 +
 +youtube-dl (2006.12.07-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - Use -t to name the downloaded file after the title, closes: #395184.
 +    - Parses URLs without a leading "http://", closes: #400321.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Sun, 10 Dec 2006 13:52:36 -0500
 +
 +youtube-dl (2006.11.12-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Sat, 25 Nov 2006 16:12:03 -0500
 +
 +youtube-dl (2006.09.25-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * python >= 2.4 is now required.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Wed, 27 Sep 2006 17:43:07 -0400
 +
 +youtube-dl (2006.08.28-1) unstable; urgency=low
 +
 +  * Initial release, closes: #385748.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Sun,  3 Sep 2006 19:43:27 -0400
 +

diff --combined youtube-dl
index 98fbeed03e75522eba0dba0ae466590076f3a963,c7d73a77fdedd77f9afc19f7bf49834b66149500..686e5c49f4ef63a6335d3eea2d34638b402872ec
--- 1/youtube-dl
--- 2/youtube-dl
+++ b/youtube-dl
@@@ -45,8 -45,8 +45,8 @@@ const_login_url_str = 'http://www.youtu
  const_login_post_str = 'current_form=loginForm&next=%%2Fwatch%%3Fv%%3D%s&username=%s&password=%s&action_login=Log+In'
  const_age_url_str = 'http://www.youtube.com/verify_age?next_url=/watch%%3Fv%%3D%s'
  const_age_post_str = 'next_url=%%2Fwatch%%3Fv%%3D%s&action_confirm=Confirm'
- const_video_url_params_re = re.compile(r'player2\.swf\?([^"]+)"', re.M)
- const_video_url_real_str = 'http://www.youtube.com/get_video?%s'
+ const_url_t_param_re = re.compile(r'[,{]t:\'([^\']*)\'')
+ const_video_url_real_str = 'http://www.youtube.com/get_video?video_id=%s&t=%s'
  const_video_title_re = re.compile(r'<title>YouTube - ([^<]*)</title>', re.M | re.I)
  const_1k = 1024
  const_initial_block_size = 10 * const_1k
@@@ -191,7 -191,7 +191,7 @@@ def calc_speed(start, now, bytes)
  
  # Create the command line options parser and parse command line
  cmdl_usage = 'usage: %prog [options] video_url'
- cmdl_version = '2007.06.22'
+ cmdl_version = '2007.08.24'
  cmdl_parser = optparse.OptionParser(usage=cmdl_usage, version=cmdl_version, conflict_handler='resolve')
  cmdl_parser.add_option('-h', '--help', action='help', help='print this help text and exit')
  cmdl_parser.add_option('-v', '--version', action='version', help='print program version and exit')
@@@ -318,8 -318,8 +318,8 @@@ if cmdl_opts.use_title or cmdl_opts.use
        video_title = extract_step('Extracting video title', 'unable to extract video title', const_video_title_re, video_webpage)
  
  # Extract needed video URL parameters
- video_url_params = extract_step('Extracting video URL parameters', 'unable to extract URL parameters', const_video_url_params_re, video_webpage)
- video_url_real = const_video_url_real_str % video_url_params
+ video_url_t_param = extract_step('Extracting URL "t" parameter', 'unable to extract URL "t" parameter', const_url_t_param_re, video_webpage)
+ video_url_real = const_video_url_real_str % (video_url_id, video_url_t_param)
  
  # Retrieve video data
  try:
@@@ -369,7 -369,7 +369,7 @@@
                block_size = new_block_size(before, after, dl_bytes)
  
        if video_len is not None and byte_counter != video_len:
 -              error_advice_exit('server did not send the expected ammount of data')
 +              error_advice_exit('server did not send the expected amount of data')
  
        video_file.close()
        cond_print('done.\n')