[SCM] Video extraction utility for YouTube, Google Video and other video sites (Debian packaging) branch, master, updated. debian/2.3.2-1-6-g8059635
Ansgar Burchardt
ansgar at debian.org
Sat Dec 10 21:22:28 UTC 2011
The following commit has been merged in the master branch:
commit 46b0945ee7612a4b3b87f9bf080942c4395bce39
Author: Ansgar Burchardt <ansgar at debian.org>
Date: Sat Dec 10 21:55:47 2011 +0100
Remove all patches (no longer apply).
diff --git a/debian/patches/645025-youtube.diff b/debian/patches/645025-youtube.diff
deleted file mode 100644
index 2f7d710..0000000
--- a/debian/patches/645025-youtube.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Ingo Saitz <Ingo.Saitz at stud.uni-hannover.de>
-Date: Tue, 11 Oct 2011 22:56:27 +0200
-Subject: Fix problem with some youtube.com videos
-Bug-Debian: http://bugs.debian.org/645025
-Forwarded: https://sourceforge.net/apps/trac/clive/ticket/14
-
---- clive.orig/lib/clive/Host/Youtube.pm
-+++ clive/lib/clive/Host/Youtube.pm
-@@ -34,7 +34,7 @@
- my %re = (
- id => qr|"video_id": "(.*?)"|,
- url_encoded_fmt_stream_map =>
-- qr|url_encoded_fmt_stream_map=(.*?)&|,
-+ qr|"url_encoded_fmt_stream_map": "(.*?)"|,
- );
-
- my $tmp;
-@@ -47,13 +47,11 @@
-
- foreach (
- split /,/,
-- URI::Escape::uri_unescape(
-- $tmp->{url_encoded_fmt_stream_map}
-- )
-+ $tmp->{url_encoded_fmt_stream_map}
- )
- {
- my %map;
-- for my $kv (split /&/) {
-+ for my $kv (split /\\u0026/) {
- my ($key, $value) = split /=/, $kv;
- $map{$key} = URI::Escape::uri_unescape($value);
- }
diff --git a/debian/patches/capitalisation.diff b/debian/patches/capitalisation.diff
deleted file mode 100644
index d2c82a2..0000000
--- a/debian/patches/capitalisation.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Ansgar Burchardt <ansgar at debian.org>
-Date: Sun, 23 Oct 2011 09:44:43 +0200
-Origin: vendor
-Subject: Fix capitalisation of host modules
-Forwarded: https://sourceforge.net/apps/trac/clive/ticket/13
-
-The same capitalisation as for the *.pm files needs to be used here or perl
-will be unable to find the modules.
---- clive.orig/lib/clive/HostFactory.pm
-+++ clive/lib/clive/HostFactory.pm
-@@ -27,24 +27,24 @@
- use clive::Error qw(CLIVE_OK);
-
- my @_hosts = (
--[ "YouTube", qr|youtube.com|i,
-+[ "Youtube", qr|youtube.com|i,
- # Sat Dec 11 2010: webm_*, 3gp_144p support found in Youtube.pm, website
- # no longer seems to list them, however. Listing here only those formats
- # that seem to still work.
- "default|flv_240p|flv_360p|flv_480p|mp4_360p|mp4_720p|mp4_1080p|mp4_3072p"],
--["LastFM", qr|last.fm|i, "See YouTube formats"],
-+["Lastfm", qr|last.fm|i, "See YouTube formats"],
- ["Google", qr|video.google.|i, "default|mp4"],
- ["Sevenload", qr|sevenload.com|i, "default"],
- ["Break", qr|break.com|i, "default"],
--["LiveLeak", qr|liveleak.com|i, "default"],
-+["Liveleak", qr|liveleak.com|i, "default"],
- ["Gaskrank", qr|gaskrank.tv|i, "default"],
--["DailyMotion", qr|dailymotion.com|i, "default|hq|hd"],
-+["Dailymotion", qr|dailymotion.com|i, "default|hq|hd"],
- ["Vimeo", qr|vimeo.com|i, "default|hd"],
- ["Spiegel", qr|spiegel.de|i, "default|vp6_928|vp6_576|vp6_64|h264_1400"],
- ["Golem", qr|golem.de|i, "default|ipod|high"],
--["ClipFish", qr|clipfish.de|i, "default"],
--[ "FunnyHub", qr|funnyhub.com|i, "default"],
--[ "BuzzHumor", qr|buzzhumor.com|i, "default"]
-+["Clipfish", qr|clipfish.de|i, "default"],
-+[ "Funnyhub", qr|funnyhub.com|i, "default"],
-+[ "Buzzhumor", qr|buzzhumor.com|i, "default"]
- );
-
- sub new {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 87ec01f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-645025-youtube.diff
-capitalisation.diff
--
Video extraction utility for YouTube, Google Video and other video sites (Debian packaging)
More information about the Pkg-perl-cvs-commits
mailing list