Imported Debian patch 2007.06.06-1

diff --cc debian/changelog
index a303b1b5ae99a5cc36452acd3ba16c4a0c81ac23,0000000000000000000000000000000000000000..a3fd0d7485292cadc369cdfcffa71c7b0e39d48a
mode 100644,000000..100644
--- 1/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@@ -1,50 -1,0 +1,57 @@@
++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/copyright
index 015e6adeb52247a2967378a7376763b88d5def2a,0000000000000000000000000000000000000000..936b464c1c0d1480c26455f70f3c65403039be41
mode 100644,000000..100644
--- 1/debian/copyright
--- /dev/null
+++ b/debian/copyright
@@@ -1,36 -1,0 +1,36 @@@
- Copyright 2006 Ricardo Garcia Gonzalez
 +This package was debianized by Robert S. Edmonds <edmonds@debian.org> on
 +Sun,  3 Sep 2006 19:43:27 -0400.
 +
 +It was downloaded from http://www.arrakis.es/~rggi3/youtube-dl/
 +
 +Copyright Holder:
 +
++Copyright 2006-2007 Ricardo Garcia Gonzalez
 +
 +License:
 +
 +# Permission is hereby granted, free of charge, to any person obtaining a
 +# copy of this software and associated documentation files (the "Software"),
 +# to deal in the Software without restriction, including without limitation
 +# the rights to use, copy, modify, merge, publish, distribute, sublicense,
 +# and/or sell copies of the Software, and to permit persons to whom the
 +# Software is furnished to do so, subject to the following conditions:
 +# 
 +# The above copyright notice and this permission notice shall be included
 +# in all copies or substantial portions of the Software.
 +# 
 +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
 +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 +# OTHER DEALINGS IN THE SOFTWARE.
 +# 
 +# Except as contained in this notice, the name(s) of the above copyright
 +# holders shall not be used in advertising or otherwise to promote the
 +# sale, use or other dealings in this Software without prior written
 +# authorization.
 +
 +The Debian packaging is (C) 2006, Robert S. Edmonds <edmonds@debian.org> and
 +is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

diff --cc debian/youtube-dl.1
index ce3096156ba674d51107106ba4b8462b99e2d8bd,0000000000000000000000000000000000000000..589bd7bbf040a5f7a609d946947a3371573385db
mode 100644,000000..100644
--- 1/debian/youtube-dl.1
--- /dev/null
+++ b/debian/youtube-dl.1
@@@ -1,38 -1,0 +1,42 @@@
- .TH YOUTUBE-DL "1" "April 2007" "youtube-dl" "User Commands"
++.TH YOUTUBE-DL "1" "June 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
++.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

diff --cc youtube-dl
Simple merge