Imported Debian patch 2008.03.22-1

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..e599230
--- /dev/null
+++ b/debian/changelog
@@ -0,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 --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..9442f88
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,13 @@
+Source: youtube-dl
+Section: web
+Priority: extra
+Maintainer: Robert S. Edmonds <edmonds@debian.org>
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.7.3
+
+Package: youtube-dl
+Architecture: all
+Depends: python (>= 2.4)
+Description: download videos from youtube.com
+ youtube-dl is a small command-line program to download videos from
+ YouTube.com.

diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..936b464
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,36 @@
+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 --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..4aff75b
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+youtube-dl usr/bin

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..8271a23
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+
+build:
+
+clean:
+       dh_testdir
+       dh_clean 
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k 
+       dh_install
+
+binary-arch:
+binary-indep: build install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs 
+       dh_installdocs
+       dh_installman debian/youtube-dl.1
+       dh_compress
+       dh_fixperms
+       dh_installdeb
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

diff --git a/debian/youtube-dl.1 b/debian/youtube-dl.1
new file mode 100644 (file)
index 0000000..fecffc2
--- /dev/null
+++ b/debian/youtube-dl.1
@@ -0,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 --git a/youtube-dl b/youtube-dl
index ba27e753c33203381d6987f377fa5dd7b823f299..52f1e3fa512c3154c4fd27b8f5c2e9724e7c8869 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -394,7 +394,7 @@ try:
                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')