Bug#608006: unblock: clive/2.2.13-5
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear Release Team
Please unblock package clive
clive is again affected partially in its functionality, this time
vimeo.com is the problem (See: http://bugs.debian.org/607923).
It is not marked as 'fully unusable' as it only affects part of clive,
but would you accept this unblock request to allow migration to
testing?
I have attached the debdiff inbetween clive 2.2.13-4 currently in
testing and clive 2.2.13-5 uploaded to unstable.
unblock clive/2.2.13-5
Again many thanks for your work and bests
Salvatore
-- System Information:
Debian Release: 6.0
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
diff -Nru clive-2.2.13/debian/changelog clive-2.2.13/debian/changelog
--- clive-2.2.13/debian/changelog 2010-12-12 16:50:03.000000000 +0100
+++ clive-2.2.13/debian/changelog 2010-12-25 23:50:42.000000000 +0100
@@ -1,3 +1,10 @@
+clive (2.2.13-5) unstable; urgency=low
+
+ * Add 0001-Vimeo.pm-Fix-video-ID-parsing-2.patch to fix vimeo.com ID
+ parsing (Closes: #607923).
+
+ -- Salvatore Bonaccorso <carnil@debian.org> Sat, 25 Dec 2010 23:34:33 +0100
+
clive (2.2.13-4) unstable; urgency=low
* Change my email address.
diff -Nru clive-2.2.13/debian/patches/0001-Vimeo.pm-Fix-video-ID-parsing-2.patch clive-2.2.13/debian/patches/0001-Vimeo.pm-Fix-video-ID-parsing-2.patch
--- clive-2.2.13/debian/patches/0001-Vimeo.pm-Fix-video-ID-parsing-2.patch 1970-01-01 01:00:00.000000000 +0100
+++ clive-2.2.13/debian/patches/0001-Vimeo.pm-Fix-video-ID-parsing-2.patch 2010-12-25 23:50:42.000000000 +0100
@@ -0,0 +1,62 @@
+From 68253c3831632787164f37d61b8fb5f148ba508a Mon Sep 17 00:00:00 2001
+From: Toni Gundogdu <legatvs.git@gmail.com>
+Date: Sat, 18 Dec 2010 16:49:25 +0200
+Subject: [PATCH] Vimeo.pm: Fix video ID parsing [#2]
+
+- http://sourceforge.net/apps/trac/clive/ticket/2
+---
+ lib/clive/Host/Vimeo.pm | 28 +++++++++++++++-------------
+ 1 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/lib/clive/Host/Vimeo.pm b/lib/clive/Host/Vimeo.pm
+index 515ff58..e11edc9 100644
+--- a/lib/clive/Host/Vimeo.pm
++++ b/lib/clive/Host/Vimeo.pm
+@@ -23,29 +23,31 @@ package clive::Host::Vimeo;
+ use warnings;
+ use strict;
+
+-sub new {
+- return bless( {}, shift );
+-}
++use clive::Error qw(CLIVE_REGEXP);
++
++sub new { return bless ({}, shift); }
+
+ sub parsePage {
+ my ( $self, $content, $props ) = @_;
+
+ $$props->video_host("vimeo");
+
+- my %re = ( id => qr|clip_id=(.*?)[&"]|, );
++ my $id = $1 if $$props->page_link =~ /vimeo\.com\/(\d+)/;
+
+- my $tmp;
+- if ( clive::Util::matchRegExps( \%re, \$tmp, $content ) == 0 ) {
+- my $config = "http://vimeo.com/moogaloop/load/clip:$tmp->{id}";
++ unless ($1) {
++ clive::Log->instance->err (CLIVE_REGEXP, "no match: video id");
++ return (1);
++ }
+
+- if ( _parseConfig( $self, $config, $tmp->{id} ) == 0 ) {
+- $$props->video_id( $tmp->{id} );
+- $$props->video_link( $self->{video_link} );
++ my $config_url = "http://vimeo.com/moogaloop/load/clip:$1";;
++ my $rc = _parseConfig ($self, $config_url, $1);
+
+- return (0);
+- }
++ unless ($rc) {
++ $$props->video_id ($id);
++ $$props->video_link ($self->{video_link});
+ }
+- return (1);
++
++ return ($rc);
+ }
+
+ sub _parseConfig {
+--
+1.7.3.3
+
diff -Nru clive-2.2.13/debian/patches/series clive-2.2.13/debian/patches/series
--- clive-2.2.13/debian/patches/series 2010-12-12 16:50:03.000000000 +0100
+++ clive-2.2.13/debian/patches/series 2010-12-25 23:50:42.000000000 +0100
@@ -1,3 +1,4 @@
fix-path-encoding-60.patch
595486-vimeo.patch
fix-606540-youtube.patch
+0001-Vimeo.pm-Fix-video-ID-parsing-2.patch
Reply to: