[SCM] Video extraction utility for YouTube, Google Video and other video sites (Debian packaging) branch, master, updated. upstream/2.1.7-214-g6762190

[legatvs]

The following commit has been merged in the master branch:
commit eb65f6f9f0b2c0053e28430d1e8cea2ce17856d7
Author: legatvs <legatvs at gmail.com>
Date:   Sun Mar 22 00:57:35 2009 +0200

    Remove --modver. Change --version output.

diff --git a/CHANGES b/CHANGES
index 206ffdb..c5e79ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 Version 2.1.8
 
  User-visible changes:
+  * Remove --modver, change --version output
   * Touch manual page (clive.1)
   * Config file: add support for [output]:format (--format)
   * Port dailymotion support from cclive
diff --git a/clive b/clive
index f7a4428..4f1f4f1 100755
--- a/clive
+++ b/clive
@@ -121,7 +121,6 @@ GetOptions(\%opts,
     'cclass|l=s',   'exec|x=s',   'progress|G=s', 'clivepass|V=s',
     'stream=i',
     'version|v'     => \&print_version,
-    'modversion|M', => \&print_version_mods,
     # Commented out until WWW::Curl is fixed:
     # 'maxspeed!', 'minspeed!',
     # Workarounds since $longopt!|$shortopt cannot be used.
@@ -1634,33 +1633,19 @@ sub emit {
 }
 
 sub print_version {
-    print "clive ".VERSION.". Copyright (c) 2007-2009 Toni Gundogdu.\n"
-        . "clive is licensed under the ISC license which is functionally\n"
-        . "equivalent to the 2-clause BSD licence.\n";
-    exit;
-}
+    printf("clive %s.  Copyright (c) 2007-2009 Toni Gundogdu.\n",VERSION);
 
-sub print_version_mods {
     my $perl_v      = sprintf "%vd", $^V;
-    my $clipboard_v = $opted_mods{Clipboard} ? $Clipboard::VERSION      : "-";
-    my $expect_v    = $opted_mods{Expect}    ? $Expect::VERSION         : "-";
-    my $iopager_v   = $opted_mods{IOPager}   ? $IO::Pager::VERSION      : "-";
-    my $readkey_v   = $opted_mods{ReadKey}   ? $Term::ReadKey::VERSION  : "-";
-print
-" * Perl/$perl_v
-Modules:
- * Config::Tiny/$Config::Tiny::VERSION\t\t* BerkeleyDB/$BerkeleyDB::VERSION
- * WWW::Curl/$WWW::Curl::VERSION\t\t* Expect/$expect_v
- * HTML::TokeParser/$HTML::TokeParser::VERSION\t* Clipboard/$clipboard_v
- * URI::Escape/$URI::Escape::VERSION\t\t* Term::ReadKey/$readkey_v
- * IO::Pager/$iopager_v
-Core modules:
- * POSIX/$POSIX::VERSION\t\t\t* Cwd/$Cwd::VERSION
- * Getopt::Long/$Getopt::Long::VERSION\t\t* Pod::Usage/$Pod::Usage::VERSION
- * File::Path/$File::Path::VERSION\t\t* File::Spec/$File::Spec::VERSION
- * Digest::SHA/$Digest::SHA::VERSION\t\t* Encode/$Encode::VERSION
- * File::Basename/$File::Basename::VERSION
-"; exit;
+    printf("--with-perl=%s-%s ",$perl_v,$^O);
+    my $i = 0;
+    foreach (sort keys %opted_mods) {
+        printf("--with-$_=%s ", $opted_mods{$_} ? "yes":"no");
+        print "\n"
+            if (++$i % 2 == 0)
+    }
+    print "\nclive is licensed under the ISC license which is functionally\n"
+        . "equivalent to the 2-clause BSD licence.\n";
+    exit;
 }
 
 __END__
@@ -1673,7 +1658,6 @@ clive [options]... [URL]...
 
  -h, --help                 print help and exit
  -v, --version              print version and exit
- -M, --modversion           print perl and module versions and exit
  -b, --background           go to background after startup
  -e, --emit-csv             emit video details as csv to stdout
  -E, --emit-xml             emit video details as csv to stdout
diff --git a/clive.1 b/clive.1
index 319f8d2..879430c 100644
--- a/clive.1
+++ b/clive.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "clive 1"
-.TH clive 1 "2009-03-21" "2.1.8" "clive manual"
+.TH clive 1 "2009-03-22" "2.1.8" "clive manual"
 .SH "NAME"
 clive \- the non\-interactive video extraction utility
 .SH "SYNOPSIS"
@@ -167,9 +167,6 @@ Print this help and exit.
 .IP "\fB\-v \-\-version\fR" 4
 .IX Item "-v --version"
 Print version and exit.
-.IP "\fB\-M \-\-modversion\fR" 4
-.IX Item "-M --modversion"
-Print installed Perl and module version details.
 .IP "\fB\-b \-\-background\fR" 4
 .IX Item "-b --background"
 Go to background immediately after startup. If no output file is specified
diff --git a/clive.pod b/clive.pod
index a35dede..fc44c74 100644
--- a/clive.pod
+++ b/clive.pod
@@ -44,10 +44,6 @@ Print this help and exit.
 
 Print version and exit.
 
-=item B<-M --modversion>
-
-Print installed Perl and module version details.
-
 =item B<-b --background>
 
 Go to background immediately after startup. If no output file is specified

-- 
Video extraction utility for YouTube, Google Video and other video sites (Debian packaging)