Imported Debian patch 2010.07.22-1

diff --combined debian/NEWS
index cd404f4259fd823e7a9c6557d1b120a57108a219,0000000000000000000000000000000000000000..a82cd572d3f63be5dbbc1bbc3868402776545668
mode 100644,000000..100644
--- 1/debian/NEWS
--- /dev/null
+++ b/debian/NEWS
@@@ -1,16 -1,0 +1,16 @@@
- youtube-dl (2010.04.04-2) unstable; urgency=low
++youtube-dl (2010.07.22-1) unstable; urgency=medium
 +
-   For the time being, you can play WebM files (which are VP8 for video and
-   Vorbis for audio, enclosed in a Matroska container) with gst123, which
-   was just uploaded to Debian.
++  The upstream author has removed support for the -b ("best format") and
++  the -d ("high def") command line options.
 +  
-   Other gstreamer-based players should support those files right away, as
-   long as you have gstreamer0.10-plugins-bad version at least 0.10.18.3-2
-   installed.
++  The behavior now is to download the best quality for each video.
++  If you experience a problem with youtube-dl downloading videos that are
++  too large, you should consider using the --max-quality option to limit
++  which format to use.
 +  
-   Videos in those formats, where available, are taken automatically with
-   the use of the '-b' switch or with the specification of formats 43 (for
-   360p videos) or 45 (for 720p videos).
++  The list of formats (in decreasing quality) can be found with:
++  
++      grep "available_formats =" /usr/bin/youtube-dl
 +
-  -- Rogério Brito <rbrito@ime.usp.br>  Sat, 29 May 2010 13:14:02 -0300
++ -- Rogério Brito <rbrito@ime.usp.br>  Thu, 22 Jul 2010 19:07:03 -0300
 +

diff --combined debian/changelog
index 804f48c0f5a870eeba6fa3ab2a25fc8257a73549,0000000000000000000000000000000000000000..9ac84915eb456b4e0481d241c081ee039ffffc5a
mode 100644,000000..100644
--- 1/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@@ -1,239 -1,0 +1,255 @@@
++youtube-dl (2010.07.22-1) unstable; urgency=medium
++
++  * Urgency set to medium due to changes in the site
++  * New upstream release:
++    + make youtube-dl work again. Closes: #589974.
++    + removed command line options -b and -f.
++  * debian/NEWS:
++    + document the removal of command line options and the new behavior.
++  * debian/patches:
++    + disabled for the moment.
++  * debian/control:
++    + include the support of dailymotion in the long description.
++    + update the standards version to 3.9.0, with no other changes.
++
++ -- Rogério Brito <rbrito@ime.usp.br>  Thu, 22 Jul 2010 18:58:29 -0300
++
 +youtube-dl (2010.07.14-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    + add preliminary support for Dailymotion videos
 +    + improve support for WebM in YouTube
 +    + add support for the "original" video format in YouTube
 +    + add a --max-quality option
 +    + add support for youtu.be URLs
 +    + add fixes.
 +  * debian/patches/01-add-support-to-webm.patch:
 +    + update and refresh.
 +
 + -- Rogério Brito <rbrito@ime.usp.br>  Wed, 14 Jul 2010 22:39:54 -0300
 +
 +youtube-dl (2010.06.06-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    + support for retrying connections after a 503 error
 +    + argument '-' can be used with -a to indicate stdin
 +    + support for webm formats
 +  * debian/patches/01-add-support-to-webm.patch:
 +    + remove parts applied upstream
 +    + update to download webm videos based on their quality
 +
 + -- Rogério Brito <rbrito@ime.usp.br>  Mon, 07 Jun 2010 04:16:54 -0300
 +
 +youtube-dl (2010.04.04-3) unstable; urgency=low
 +
 +  * Migrate the packaging to smaller dh(7) style.
 +  * Update the years of copyright.
 +
 + -- Rogério Brito <rbrito@ime.usp.br>  Tue, 01 Jun 2010 11:06:06 -0300
 +
 +youtube-dl (2010.04.04-2) unstable; urgency=low
 +
 +  * Add support to webm (vp8 + vorbis) format:
 +    + debian/patches/01-add-support-to-webm.patch: the code
 +    + debian/NEWS: the documentation
 +    + debian/control: the suggests field
 +
 + -- Rogério Brito <rbrito@ime.usp.br>  Sat, 29 May 2010 13:11:43 -0300
 +
 +youtube-dl (2010.04.04-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    + allow grabbing videos from vevo.
 +    + allow download whole playlists and keep the videos numbered.
 +    + add support for new playlist style.
 +    + fix detection of multipage playlists.
 +    + insist a little bit more to grab videos from youtube.
 +    + add information extractor for video.yahoo.com.
 +    + fix cosmetic issues with rtmpdump.
 +    + add option --all-formats to grab all available formats for a given video.
 +    + add "-" (without quotes) as an alias to output videos to stdout.
 +
 + -- Rogério Brito <rbrito@ime.usp.br>  Sun, 04 Apr 2010 17:55:00 -0300
 +
 +youtube-dl (2010.03.13-1) unstable; urgency=low
 +
 +  * New upstream release
 +    + added option to disable the status/progress updates.
 +    + fine tuned the sequence of formats searched to discover the best quality.
 +
 + -- Rogério Brito <rbrito@ime.usp.br>  Sun, 14 Mar 2010 23:33:48 -0300
 +
 +youtube-dl (2010.02.13-1) unstable; urgency=low
 +
 +  * New upstream release
 +    + stronger parsing of URLs.
 +    + better generation of filenames.
 +  * debian/control:
 +    + include misc-depends due to debhelper.
 +    + the package is compliant with policy 3.8.4.
 +
 + -- Rogério Brito <rbrito@ime.usp.br>  Wed, 17 Feb 2010 00:19:23 -0200
 +
 +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 --combined debian/control
index 92e2b70080f8bd237a18e0a21c5e37a8ad2a7047,0000000000000000000000000000000000000000..1912b3ec9c073dec49f2f6167597d08894a9845d
mode 100644,000000..100644
--- 1/debian/control
--- /dev/null
+++ b/debian/control
@@@ -1,25 -1,0 +1,25 @@@
- Standards-Version: 3.8.4
 +Source: youtube-dl
 +Section: web
 +Priority: extra
 +Maintainer: Rogério Brito <rbrito@ime.usp.br>
 +Build-Depends: debhelper (>= 7)
-  and metacafe.
++Standards-Version: 3.9.0
 +DM-Upload-Allowed: yes
 +Homepage: http://bitbucket.org/rg3/youtube-dl/
 +
 +Package: youtube-dl
 +Architecture: all
 +Depends: python (>= 2.4), ${misc:Depends}
 +Suggests: rtmpdump, gstreamer0.10-plugins-bad (>= 0.10.18.3-2)
 +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,
++ dailymotion, and metacafe.

diff --combined debian/patches/series
index 4c05f0a7898f0d22ceef4bef088c260fb2de523d,0000000000000000000000000000000000000000..4c4b9141ca87d06d1a1c548f1e5c3f9f5ec034b8
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- 01-add-support-to-webm.patch
++#01-add-support-to-webm.patch