Imported Debian patch 2008.03.22-1

diff --cc debian/changelog
index 61a7caa92653f7dbbd9b12cc366f902b11a66860,0000000000000000000000000000000000000000..e59923066a6a01befd0d9264f07989b875c97e08
mode 100644,000000..100644
--- 1/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@@ -1,90 -1,0 +1,97 @@@
++youtube-dl (2008.03.22-1) unstable; urgency=low
++
++  * New upstream release:
++    - adds -f / --format command line option.
++
++ -- Robert S. Edmonds <edmonds@debian.org>  Wed, 26 Mar 2008 13:19:23 -0400
++
 +youtube-dl (2008.03.08-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - adds -b / --best-quality command line option.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Wed, 12 Mar 2008 14:26:04 -0400
 +
 +youtube-dl (2008.01.24-1) unstable; urgency=low
 +
 +  * New upstream release; closes: #462427, #462428.
 +    - fixes youtube download issues.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Thu, 24 Jan 2008 22:15:05 -0500
 +
 +youtube-dl (2007.10.09-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Mon, 08 Oct 2007 19:22:33 -0400
 +
 +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 --cc debian/youtube-dl.1
index 864123feb186007a7e6bcaa594008b007e581928,0000000000000000000000000000000000000000..fecffc2d0b76f1b8201a442c048f55bea5854716
mode 100644,000000..100644
--- 1/debian/youtube-dl.1
--- /dev/null
+++ b/debian/youtube-dl.1
@@@ -1,44 -1,0 +1,48 @@@
 +.TH YOUTUBE-DL "1" "March 2008" "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
 +.TP
 +\fB\-g\fR, \fB\-\-get-url\fR
 +print final video URL only
 +.TP
 +\fB\-2\fR, \fB\-\-title-too\fR
 +used with -g, print title too
++.TP
++\fB\-f\fR FORMAT, \fB\-\-format\fR=\fIFORMAT\fR
++append &fmt=FORMAT to the URL
++.TP
 +\fB\-b\fR, \fB\-\-best-quality\fR
 +try to download the best quality version

diff --cc youtube-dl
Simple merge