Imported Debian patch 2010.01.19-1

diff --cc debian/changelog
index 8094ccbb8b94dda624c5054a2f5bece3db7c355d,0000000000000000000000000000000000000000..824ec1f3d0070c77c5604ab2f3034aeed9b3fa46
mode 100644,000000..100644
--- 1/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@@ -1,142 -1,0 +1,163 @@@
++youtube-dl (2010.01.19-1) unstable; urgency=low
++
++  * New upstream release. As upstream does not provide a changelog, here
++    are the highlights:
++    + patched to add Google Video and Photobucket support
++    + add support for using rtmpdump
++    + added support to download all of a user's videos!
++    + fix detection of uploader nickname in metacafe
++    + take format 37 into account
++    + add self-updating code
++    + allow empty titles because they do appear in some videos
++    + use default values for "continuedl" and "nooverwrites" parameters
++    + avoid using Unicode strings when forming URL requests
++    + improve preferred encoding detection method
++  * Remove all patches (applied upstream).
++  * Add suggests on rtmpdump.
++  * Shorten the short description.
++  * Include list of sites supported in the long description.
++
++ -- Rogério Brito <rbrito@ime.usp.br>  Tue, 26 Jan 2010 11:28:40 -0200
++
 +youtube-dl (2009.09.13-2) unstable; urgency=low
 +
 +  * change to "3.0 (quilt)" format.
 +  * add support for 1080p videos. Thanks Josh Triplett. Closes: #557042.
 +  * include a better manpage. Closes: #553919.
 +  * include the DMUA: yes field.
 +  * kindly reviewed by Li Daobing.
 +
 + -- Rogério Brito <rbrito@ime.usp.br>  Thu, 19 Nov 2009 11:21:36 -0200
 +
 +youtube-dl (2009.09.13-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * debian/watch:
 +    + adjust for the new upstream layout.
 +  * debian/control:
 +    + Standards-Version updated to 3.8.3. No changes needed.
 +
 + -- Rogério Brito <rbrito@ime.usp.br>  Sat, 10 Oct 2009 12:17:53 -0300
 +
 +youtube-dl (2009.08.08-1~try01) unstable; urgency=low
 +
 +  * The current maintainer seems busy (Closes: #491616):
 +    + ability to recognize more qualities of a video.
 +    + ability to automatically find the best quality video.
 +    + ability to download entire playlists.
 +    + ability to specify various urls. (Closes: #452071)
 +    + ability to resume interrupted downloads.
 +    + many other things.
 +  * debian/copyright:
 +    + rework the file.
 +    + mention that the package is in the public domain.
 +    + include my information.
 +    + update the URL of the package.
 +  * debian/control:
 +    + add a Homepage: field.
 +    + keeping the current manpage for now.
 +    + give more details in the long description.
 +    + list me as the maintainer.
 +    + Standards-Version updated to 3.8.2.
 +  * debian/watch:
 +    + let's help with automatic updates.
 +
 + -- Rogério Brito <rbrito@ime.usp.br>  Mon, 10 Aug 2009 08:14:08 -0300
 +
 +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/control
index 963aab74a53cb5154c883a2eb30d2910a6337e70,0000000000000000000000000000000000000000..3749c98950b516708229096c69a289714a786dc4
mode 100644,000000..100644
--- 1/debian/control
--- /dev/null
+++ b/debian/control
@@@ -1,20 -1,0 +1,25 @@@
- Description: download videos from youtube.com
 +Source: youtube-dl
 +Section: web
 +Priority: extra
 +Maintainer: Rogério Brito <rbrito@ime.usp.br>
 +Build-Depends: debhelper (>= 5)
 +Standards-Version: 3.8.3
 +DM-Upload-Allowed: yes
 +Homepage: http://bitbucket.org/rg3/youtube-dl/
 +
 +Package: youtube-dl
 +Architecture: all
 +Depends: python (>= 2.4)
-  automatically determine the best quality video to grab.
++Suggests: rtmpdump
++Description: download videos from youtube
 + youtube-dl is a small command-line program to download videos from
 + YouTube.com and other sites that don't provide direct links to the
 + videos served.
 + .
 + youtube-dl allows the user, among other things, to choose a specific
 + video quality to download (if available) or let the program
++ automatically determine the best quality video to grab. It supports
++ downloading entire playlists and all videos from a given user.
++ .
++ Currently supported sites are video.google.com, youtube, photobucket,
++ and metacafe.