[get-flash-videos] 02/12: Remove patches applied upstream
Daniel Lintott
dlintott-guest at moszumanska.debian.org
Sun Mar 23 21:55:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
dlintott-guest pushed a commit to branch master
in repository get-flash-videos.
commit a52a2b27537c34d0523972cd3056e036c7ba736b
Author: Daniel Lintott <daniel at serverb.co.uk>
Date: Sun Mar 23 21:01:32 2014 +0000
Remove patches applied upstream
---
debian/patches/fix_redirect.diff | 15 --------
debian/patches/series | 2 -
...utube.pm-to-fix-breakage-with-introduction.diff | 45 ----------------------
3 files changed, 62 deletions(-)
diff --git a/debian/patches/fix_redirect.diff b/debian/patches/fix_redirect.diff
deleted file mode 100644
index 38bb6b4..0000000
--- a/debian/patches/fix_redirect.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Allow URL redirects
-Forwarded: http://code.google.com/p/get-flash-videos/issues/detail?id=229
-Author: TANIGUCHI Takaki <takaki at debian.org>
-Last-Update: 2012-02-01
---- a/lib/FlashVideo/Site/Googlevideosearch.pm
-+++ b/lib/FlashVideo/Site/Googlevideosearch.pm
-@@ -10,6 +10,8 @@
- my($self, $search, $type) = @_;
-
- my $browser = FlashVideo::Mechanize->new;
-+
-+ $browser->allow_redirects;
-
- $browser->get('http://video.google.com/videoadvancedsearch');
-
diff --git a/debian/patches/series b/debian/patches/series
index cf0b3a9..dcf76f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-fix_redirect.diff
00_fix_manpage_warning.diff
use_libcrypt-blowfish-perl.diff
-updated-Youtube.pm-to-fix-breakage-with-introduction.diff
no-network-tests.patch
diff --git a/debian/patches/updated-Youtube.pm-to-fix-breakage-with-introduction.diff b/debian/patches/updated-Youtube.pm-to-fix-breakage-with-introduction.diff
deleted file mode 100644
index fc37d4a..0000000
--- a/debian/patches/updated-Youtube.pm-to-fix-breakage-with-introduction.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Kevin Skusek <nightkev at gmail.com>
-Date: Fri, 28 Sep 2012 01:15:34 -0700
-Subject: updated Youtube.pm to fix breakage with introduction of new
- signature url parameter
-
----
- lib/FlashVideo/Site/Youtube.pm | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/lib/FlashVideo/Site/Youtube.pm b/lib/FlashVideo/Site/Youtube.pm
-index 70e4994..ce46ab6 100644
---- a/lib/FlashVideo/Site/Youtube.pm
-+++ b/lib/FlashVideo/Site/Youtube.pm
-@@ -62,8 +62,7 @@ sub find_video {
- my $video_id;
- if ($browser->content =~ /(?:var pageVideoId =|(?:CFG_)?VIDEO_ID'?\s*:)\s*'(.+?)'/
- || $browser->content =~ /"video_id": "([^"]+)"/
-- || $embed_url =~ /v=([^&]+)/
-- || $browser->content =~ /&video_id=([^&]+)&/) {
-+ || $embed_url =~ /v=([^&]+)/) {
- $video_id = $1;
- } else {
- check_die($browser, "Couldn't extract video ID");
-@@ -178,6 +177,7 @@ sub parse_youtube_url_encoded_fmt_stream_map {
-
- my $format = "";
- my $url = "";
-+ my $signature = "";
-
- foreach my $pair (split /&/, $params) {
- my ($name, $value) = split /=/, $pair;
-@@ -185,10 +185,12 @@ sub parse_youtube_url_encoded_fmt_stream_map {
- $format = $value;
- } elsif ($name eq "url") {
- $url = uri_unescape($value);
-+ } elsif ($name eq "sig") {
-+ $signature = $value;
- }
- }
-
-- $map->{$format} = $url;
-+ $map->{$format} = $url."&signature=".$signature;
- }
-
- return $map;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/get-flash-videos.git
More information about the Pkg-perl-cvs-commits
mailing list