From a475f326a4099c540835dacdda9dbbf92a56130d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rog=C3=A9rio=20Brito?= Date: Mon, 31 Jan 2011 20:30:36 -0200 Subject: [PATCH 1/1] Imported Debian patch 2011.01.30-2 --- debian/changelog | 10 ++++++++++ debian/control | 3 ++- debian/rules | 4 ++++ debian/youtube-dl.1 | 34 ++++++++++++++++++++++++---------- debian/youtube-dl.pod | 4 +++- 5 files changed, 43 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index ff549e9..f1cfcaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +youtube-dl (2011.01.30-2) unstable; urgency=low + + * debian/control: + + include build-depends-indep on perl, for pod2man (not used during clean). + + update the build-dependency on debhelper (we use the override feature). + * debian/rules: + + generate the actual manpage from the pod source at build time. + + -- Rogério Brito Mon, 31 Jan 2011 20:30:36 -0200 + youtube-dl (2011.01.30-1) unstable; urgency=low * New upstream release. Some highlights: diff --git a/debian/control b/debian/control index 1f46f4c..a2523c5 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,8 @@ Source: youtube-dl Section: web Priority: extra Maintainer: Rogério Brito -Build-Depends: debhelper (>= 7) +Build-Depends: debhelper (>= 7.0.50~) +Build-Depends-Indep: perl Standards-Version: 3.9.1 DM-Upload-Allowed: yes Homepage: http://rg3.github.com/youtube-dl/ diff --git a/debian/rules b/debian/rules index cbe925d..1e2fae8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,3 +1,7 @@ #!/usr/bin/make -f %: dh $@ + +override_dh_installman: + pod2man debian/youtube-dl.pod > debian/youtube-dl.1 + dh_installman diff --git a/debian/youtube-dl.1 b/debian/youtube-dl.1 index f708c39..d6aa91b 100644 --- a/debian/youtube-dl.1 +++ b/debian/youtube-dl.1 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "YOUTUBE-DL 1" -.TH YOUTUBE-DL 1 "2010-12-10" "perl v5.10.1" "User Contributed Perl Documentation" +.TH YOUTUBE-DL 1 "2011-01-31" "perl v5.10.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -183,6 +183,10 @@ The number \fBN\fR of the video in a playlist where we should start downlading .IX Item "--playlist-end=N" The number \fBN\fR of the video in a playlist where we should stop downloading (default is \-1, which stands for the last video in the playlist). +.IP "\-\-dump\-user\-agent" 4 +.IX Item "--dump-user-agent" +Display how youtube-dl will identify itself (the User-Agent string) to the +remote server. .IP "\-u \fB\s-1UN\s0\fR, \-\-username=\fB\s-1UN\s0\fR" 4 .IX Item "-u UN, --username=UN" Specify the youtube account username \fB\s-1UN\s0\fR. Some videos require an @@ -224,16 +228,10 @@ For youtube.com, in particular, the meaning of the format codes is given as: .RS 4 .PD .Sp -Note that not all videos are available in all formats. +Note that not all videos are available in all formats and that other +sites supported by \fByoutube-dl\fR may have different conventions for +their video formats. .RE -.IP "\-b, \-\-best\-quality" 4 -.IX Item "-b, --best-quality" -This option is deprecated, does nothing currently, and is expected to be -removed in a next release, as it is the current behavior of youtube-dl. -.IP "\-m, \-\-mobile\-version" 4 -.IX Item "-m, --mobile-version" -Synonymous to the option \*(L"\-f 17\*(R", to download videos playable on some -mobile phones. .IP "\-\-all\-formats" 4 .IX Item "--all-formats" Downloads all formats for which a video may be available. @@ -265,9 +263,16 @@ thumbnail. .IX Item "--get-description" Simulate the operation, like quiet mode, but print the description of the video. +.IP "\-\-get\-filename" 4 +.IX Item "--get-filename" +Simulate the operation, like quiet mode, but print the output filename. .IP "\-\-no\-progress" 4 .IX Item "--no-progress" Do not print the progress bar during downloads. +.IP "\-\-console\-title" 4 +.IX Item "--console-title" +If possible, set the title of the console window with the progress of the +download. .IP "\-t, \-\-title" 4 .IX Item "-t, --title" Use the title of the video in the file name used to download the video. @@ -297,6 +302,15 @@ Do no overwrite already existing files. .IP "\-c, \-\-continue" 4 .IX Item "-c, --continue" Resume partially downloaded files. +.IP "\-\-cookies=\fBF\fR" 4 +.IX Item "--cookies=F" +Store the received cookies to file \fBF\fR (the \*(L"cookie jar\*(R"). +.IP "\-\-no\-part" 4 +.IX Item "--no-part" +Do not append the \fI.part\fR suffix do files that have not yet been completed. +.IP "\-\-no\-mtime" 4 +.IX Item "--no-mtime" +Do not use the \fILast-modified\fR header to set the file modification time. .SH "OUTPUT TEMPLATE" .IX Header "OUTPUT TEMPLATE" The \-o option allows users to indicate a template for the output file diff --git a/debian/youtube-dl.pod b/debian/youtube-dl.pod index 0f0fdaf..9f25ab1 100644 --- a/debian/youtube-dl.pod +++ b/debian/youtube-dl.pod @@ -112,7 +112,9 @@ For youtube.com, in particular, the meaning of the format codes is given as: =back -Note that not all videos are available in all formats. +Note that not all videos are available in all formats and that other +sites supported by B may have different conventions for +their video formats. =item --all-formats -- 2.41.1