[get-flash-videos] 02/04: drop two patches applied upstream

[Damyan Ivanov]

This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to branch master
in repository get-flash-videos.

commit 58bb45dbe256dc7050b38c1c7e2fb8d9ddf474b9
Author: Damyan Ivanov <dmn at debian.org>
Date:   Fri Jan 12 20:19:36 2018 +0000

    drop two patches applied upstream
---
 .../Count-https-video-URLs-in-the-results.patch    | 30 ----------------------
 .../patches/deprecated-left-brace-in-regex.patch   | 21 ---------------
 debian/patches/series                              |  2 --
 3 files changed, 53 deletions(-)

diff --git a/debian/patches/Count-https-video-URLs-in-the-results.patch b/debian/patches/Count-https-video-URLs-in-the-results.patch
deleted file mode 100644
index ef511a8..0000000
--- a/debian/patches/Count-https-video-URLs-in-the-results.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ad36427136f759d3f7be85a074a4f8bafe5a42a9 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Wed, 14 Oct 2015 10:06:31 +0300
-Subject: [PATCH] Count https video URLs in the results
-Forwarded: https://github.com/monsieurvideo/get-flash-videos/pull/220
-Bug: https://github.com/monsieurvideo/get-flash-videos/pull/220
-Bug-Debian: https://bugs.debian.org/801747
-
-Some video URLs on the Google video site now start
-with https, making the test fail.
----
- t/google_video_search.t | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/google_video_search.t b/t/google_video_search.t
-index 0609bb8..1c37398 100644
---- a/t/google_video_search.t
-+++ b/t/google_video_search.t
-@@ -23,7 +23,7 @@ my $sane_result_count = 0;
- foreach my $result (@results) {
-   if ((ref($result) eq 'HASH') and
-       $result->{name} and
--      $result->{url} =~ m'^http://') {
-+      $result->{url} =~ m'^https?://') {
-     $sane_result_count++;
-   }
- }
--- 
-2.5.1
-
diff --git a/debian/patches/deprecated-left-brace-in-regex.patch b/debian/patches/deprecated-left-brace-in-regex.patch
deleted file mode 100644
index d4e99c0..0000000
--- a/debian/patches/deprecated-left-brace-in-regex.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: fix deprecation warning about unescaped left brace in regex
- $ perl -c lib/FlashVideo/RTMPDownloader.pm
- Unescaped left brace in regex is deprecated here (and will be fatal in Perl
- 5.30), passed through in regex; marked by <-- HERE in m/^[A-F0-9]{ <-- HERE
- ,2}(?:\s+[A-F0-9]{2})*\s*$/ at lib/FlashVideo/RTMPDownloader.pm line 222.
- lib/FlashVideo/RTMPDownloader.pm syntax OK
-Author: Damyan Ivanov <dmn at debian.org>
-Forwarded: https://github.com/monsieurvideo/get-flash-videos/pull/219
-Bug: https://github.com/monsieurvideo/get-flash-videos/pull/219
-
---- a/lib/FlashVideo/RTMPDownloader.pm
-+++ b/lib/FlashVideo/RTMPDownloader.pm
-@@ -219,7 +219,7 @@ sub run {
-         $self->progress;
-       } elsif(/\012$/) {
-         for my $l(split /\012/) {
--          if($l =~ /^[A-F0-9]{,2}(?:\s+[A-F0-9]{2})*\s*$/) {
-+          if($l =~ /^[A-F0-9]{0,2}(?:\s+[A-F0-9]{2})*\s*$/) {
-             debug $l;
-           } elsif($l =~ /Download complete/) {
-             $complete = 1;
diff --git a/debian/patches/series b/debian/patches/series
index e321d95..dcf76f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 00_fix_manpage_warning.diff
 use_libcrypt-blowfish-perl.diff
 no-network-tests.patch
-deprecated-left-brace-in-regex.patch
-Count-https-video-URLs-in-the-results.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/get-flash-videos.git