From: Robert S. Edmonds <edmonds@debian.org>
Date: Tue, 3 Apr 2007 01:46:56 +0000 (-0400)
Subject: Imported Debian patch 2007.03.27-1
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/ea94aadfa2b344a139c59de0a1bbcb6b27b82962?hp=--cc

Imported Debian patch 2007.03.27-1
---

ea94aadfa2b344a139c59de0a1bbcb6b27b82962
diff --cc debian/changelog
index d5f6237,0000000..a303b1b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,0 +1,50 @@@
++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 --cc debian/youtube-dl.1
index fb27072,0000000..ce30961
mode 100644,000000..100644
--- a/debian/youtube-dl.1
+++ b/debian/youtube-dl.1
@@@ -1,33 -1,0 +1,38 @@@
- .TH YOUTUBE-DL "1" "January 2007" "youtube-dl" "User Commands"
++.TH YOUTUBE-DL "1" "April 2007" "youtube-dl" "User Commands"
 +.SH NAME
 +youtube-dl \- download a video file from YouTube.com
 +.SH DESCRIPTION
 +usage: youtube\-dl [options] video_url
 +.SS "options:"
 +.TP
 +\fB\-h\fR, \fB\-\-help\fR
 +print this help text and exit
 +.TP
 +\fB\-v\fR, \fB\-\-version\fR
 +print program version and exit
 +.TP
 +\fB\-u\fR USERNAME, \fB\-\-username\fR=\fIUSERNAME\fR
 +account username
 +.TP
 +\fB\-p\fR PASSWORD, \fB\-\-password\fR=\fIPASSWORD\fR
 +account password
 +.TP
 +\fB\-o\fR FILE, \fB\-\-output\fR=\fIFILE\fR
 +output video file name
 +.TP
 +\fB\-q\fR, \fB\-\-quiet\fR
 +activates quiet mode
 +.TP
 +\fB\-s\fR, \fB\-\-simulate\fR
 +do not download video
 +.TP
 +\fB\-t\fR, \fB\-\-title\fR
 +use title in file name
 +.TP
++\fB\-l\fR, \fB\-\-literal\fR
++use literal title in file name
++.TP
 +\fB\-n\fR, \fB\-\-netrc\fR
 +use .netrc authentication data
++\fB\-g\fR, \fB\-\-get-url\fR
++print final video URL only
diff --cc youtube-dl
index 6d53fa3,8399e88..5e12489
--- a/youtube-dl
+++ b/youtube-dl
@@@ -300,6 -361,9 +361,9 @@@ try
  		video_file.write(video_block)
  		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')
  	cond_print('Video data saved to %s\n' % video_filename)