[SCM] Video extraction utility for YouTube, Google Video and other video sites (Debian packaging) branch, master, updated. debian/2.1.14-1-37-g0163a24

Damyan Ivanov dmn at debian.org
Fri Aug 7 15:07:27 UTC 2009


The following commit has been merged in the master branch:
commit 6fb27c73d3a5dc8c05cc411cdfd9f644d83ec729
Author: Damyan Ivanov <dmn at debian.org>
Date:   Fri Aug 7 17:56:44 2009 +0300

    drop debian/patches; the patch there were applied upstream

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 9dc3fca..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
diff --git a/debian/control b/debian/control
index 3b81f8c..76e8a47 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Damyan Ivanov <dmn at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>
-Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7)
+Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: perl,
  libclass-singleton-perl (>= 1.4),
  libgetopt-argvfile-perl (>= 1.11),
diff --git a/debian/patches/disable-internet-tests.patch b/debian/patches/disable-internet-tests.patch
deleted file mode 100644
index 889a5a5..0000000
--- a/debian/patches/disable-internet-tests.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-disable tests that require internet access
-http://code.google.com/p/clive/issues/detail?id=24
-
---- a/t/02youtube.t
-+++ b/t/02youtube.t
-@@ -3,7 +3,12 @@
- use warnings;
- use strict;
- 
--use Test::More tests => 8;
-+use Test::More;
-+if($ENV{NO_INTERNET}) {
-+    plan skip_all => "No internet during package build";
-+} else {
-+    plan tests => 8;
-+}
- use Test::clive;
- 
- Test::clive::host( qq|http://www.youtube.com/watch?v=gb2fUOW1ne4|, "-f $_" )
---- a/t/03break.t
-+++ b/t/03break.t
-@@ -3,7 +3,12 @@
- use warnings;
- use strict;
- 
--use Test::More tests => 1;
-+use Test::More;
-+if($ENV{NO_INTERNET}) {
-+    plan skip_all => "No internet during package build";
-+} else {
-+    plan tests => 1;
-+}
- use Test::clive;
- 
- Test::clive::host(qq|http://break.com/index/beach-tackle-whip-lash.html|);
---- a/t/04liveleak.t
-+++ b/t/04liveleak.t
-@@ -3,7 +3,12 @@
- use warnings;
- use strict;
- 
--use Test::More tests => 2;
-+use Test::More;
-+if($ENV{NO_INTERNET}) {
-+    plan skip_all => "No internet during package build";
-+} else {
-+    plan tests => 2;
-+}
- use Test::clive;
- 
- Test::clive::host(qq|http://www.liveleak.com/view?i=704_1228511265|);
---- a/t/05dailymotion.t
-+++ b/t/05dailymotion.t
-@@ -3,7 +3,12 @@
- use warnings;
- use strict;
- 
--use Test::More tests => 6;
-+use Test::More;
-+if($ENV{NO_INTERNET}) {
-+    plan skip_all => "No internet during package build";
-+} else {
-+    plan tests => 6;
-+}
- use Test::clive;
- 
- foreach (qw(flv spak-mini vp6-hq vp6-hd vp6 h264)) {
---- a/t/06lastfm.t
-+++ b/t/06lastfm.t
-@@ -3,7 +3,12 @@
- use warnings;
- use strict;
- 
--use Test::More tests => 1;
-+use Test::More;
-+if($ENV{NO_INTERNET}) {
-+    plan skip_all => "No internet during package build";
-+} else {
-+    plan tests => 1;
-+}
- use Test::clive;
- 
- Test::clive::host(
---- a/t/07cctv.t
-+++ b/t/07cctv.t
-@@ -3,7 +3,12 @@
- use warnings;
- use strict;
- 
--use Test::More tests => 1;
-+use Test::More;
-+if($ENV{NO_INTERNET}) {
-+    plan skip_all => "No internet during package build";
-+} else {
-+    plan tests => 1;
-+}
- use Test::clive;
- 
- Test::clive::host(qq|http://space.tv.cctv.com/video/VIDE1212909276513233|);
---- a/t/08evisor.t
-+++ b/t/08evisor.t
-@@ -3,7 +3,12 @@
- use warnings;
- use strict;
- 
--use Test::More tests => 1;
-+use Test::More;
-+if($ENV{NO_INTERNET}) {
-+    plan skip_all => "No internet during package build";
-+} else {
-+    plan tests => 1;
-+}
- use Test::clive;
- 
- Test::clive::host(
---- a/t/09google.t
-+++ b/t/09google.t
-@@ -3,7 +3,12 @@
- use warnings;
- use strict;
- 
--use Test::More tests => 3;
-+use Test::More;
-+if($ENV{NO_INTERNET}) {
-+    plan skip_all => "No internet during package build";
-+} else {
-+    plan tests => 3;
-+}
- use Test::clive;
- 
- Test::clive::host(
---- a/t/10sevenload.t
-+++ b/t/10sevenload.t
-@@ -3,7 +3,12 @@
- use warnings;
- use strict;
- 
--use Test::More tests => 5;
-+use Test::More;
-+if($ENV{NO_INTERNET}) {
-+    plan skip_all => "No internet during package build";
-+} else {
-+    plan tests => 5;
-+}
- use Test::clive;
- 
- Test::clive::host(
---- a/t/11redtube.t
-+++ b/t/11redtube.t
-@@ -3,7 +3,12 @@
- use warnings;
- use strict;
- 
--use Test::More tests => 1;
-+use Test::More;
-+if($ENV{NO_INTERNET}) {
-+    plan skip_all => "No internet during package build";
-+} else {
-+    plan tests => 1;
-+}
- use Test::clive;
- 
- Test::clive::host(qq|http://www.redtube.com/11573|);
---- a/t/12vimeo.t
-+++ b/t/12vimeo.t
-@@ -3,7 +3,12 @@
- use warnings;
- use strict;
- 
--use Test::More tests => 2;
-+use Test::More;
-+if($ENV{NO_INTERNET}) {
-+    plan skip_all => "No internet during package build";
-+} else {
-+    plan tests => 2;
-+}
- use Test::clive;
- 
- Test::clive::host( qq|http://vimeo.com/1485507|, "-f $_" )
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ef12f50..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-disable-internet-tests.patch
diff --git a/debian/rules b/debian/rules
index ba24e10..51ddc82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,4 +2,4 @@
 # -*- makefile -*-
 
 %:
-	NO_INTERNET=yes dh --with quilt $@
+	NO_INTERNET=yes dh $@

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



More information about the Pkg-perl-cvs-commits mailing list