diff -Nru xmltv-0.5.61/debian/changelog xmltv-0.5.61/debian/changelog --- xmltv-0.5.61/debian/changelog 2012-07-27 19:17:35.000000000 +0000 +++ xmltv-0.5.61/debian/changelog 2012-07-27 19:14:07.000000000 +0000 @@ -1,3 +1,12 @@ +xmltv (0.5.61-1ubuntu1) precise-proposed; urgency=low + + * debian/patches/tv_grab_huro: _huro: unbreak after site changes. + (LP: #1018756) + * debian/control: Upped Standards-Version to 3.9.3 (no changes required) + * debian/control: Set Maintainer field to Ubuntu MOTU Developers + + -- POJAR GEORGE Fri, 27 Jul 2012 18:41:25 +0000 + xmltv (0.5.61-1) unstable; urgency=low * New upstream release diff -Nru xmltv-0.5.61/debian/control xmltv-0.5.61/debian/control --- xmltv-0.5.61/debian/control 2012-07-27 19:17:35.000000000 +0000 +++ xmltv-0.5.61/debian/control 2012-07-27 19:15:52.000000000 +0000 @@ -1,10 +1,11 @@ Source: xmltv Section: interpreters Priority: optional -Maintainer: Chris Butler +Maintainer: Ubuntu MOTU +XSBC-Original-Maintainer: Chris Butler Build-Depends: debhelper (>= 7.0.50~) Build-Depends-Indep: perl, perl-modules, libwww-perl (>= 5.65), libxml-parser-perl (>= 2.34), libxml-twig-perl (>= 3.28), libxml-writer-perl (>= 0.6), libdate-manip-perl (>= 5.42a), libarchive-zip-perl (>= 1.14), libcompress-zlib-perl, libhtml-parser-perl (>= 3.34), libhtml-tableextract-perl, libhtml-tree-perl (>= 3.17), libhttp-cache-transparent-perl (>= 1.0), libio-stringy-perl, libsoap-lite-perl, libterm-readkey-perl, libtext-kakasi-perl, perl-tk, libtk-tablematrix-perl, libwww-mechanize-perl (>= 1.02), libxml-libxml-perl, libterm-progressbar-perl (>= 2.09), liblingua-preferred-perl (>= 0.2.4), libunicode-string-perl, liblog-tracemessages-perl, libfile-slurp-perl, libxml-simple-perl, libtext-bidi-perl, libxml-dom-perl, libxml-libxslt-perl, libdatetime-format-strptime-perl, libparse-recdescent-perl, libtext-iconv-perl, libjson-perl, libdata-dump-perl -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Vcs-Browser: http://git.crustynet.org.uk/xmltv.git Vcs-Git: git://git.crustynet.org.uk/xmltv.git Homepage: http://xmltv.org/ diff -Nru xmltv-0.5.61/debian/patches/series xmltv-0.5.61/debian/patches/series --- xmltv-0.5.61/debian/patches/series 2012-07-27 19:17:35.000000000 +0000 +++ xmltv-0.5.61/debian/patches/series 2012-07-27 18:36:07.000000000 +0000 @@ -1,2 +1,3 @@ it_dvb_linux_warning 11_makefile_pl_debian_changes.diff +tv_grab_huro.patch diff -Nru xmltv-0.5.61/debian/patches/tv_grab_huro.patch xmltv-0.5.61/debian/patches/tv_grab_huro.patch --- xmltv-0.5.61/debian/patches/tv_grab_huro.patch 1970-01-01 00:00:00.000000000 +0000 +++ xmltv-0.5.61/debian/patches/tv_grab_huro.patch 2012-07-27 19:11:02.000000000 +0000 @@ -0,0 +1,68 @@ +## Description: _huro: unbreak after site changes +## Origin: upstream, + http://xmltv.cvs.sourceforge.net/viewvc/xmltv/xmltv/grab/huro/tv_grab_huro.in?r1=1.46&r2=1.47&view=patch + http://xmltv.cvs.sourceforge.net/viewvc/xmltv/xmltv/grab/huro/tv_grab_huro.in?r1=1.47&r2=1.48&view=patch +## Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xmltv/+bug/1018756 +## Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679378 +## Author: Pojar George, Istvan Varadi and Zoltan Karcagi +## Forwarded: not-needed +Index: xmltv/grab/huro/tv_grab_huro.in +=================================================================== +--- xmltv.orig/grab/huro/tv_grab_huro.in 2012-07-27 18:35:17.900013000 +0000 ++++ xmltv/grab/huro/tv_grab_huro.in 2012-07-27 18:37:29.000000000 +0000 +@@ -2,7 +2,7 @@ + # vi:noet:ts=4 + + #------------------------------------------------------------------------------- +-# $Id: tv_grab_huro.in,v 1.45 2011/04/12 19:05:34 dekarl Exp $ ++# $Id: tv_grab_huro.in,v 1.48 2012/06/19 06:32:25 dekarl Exp $ + #------------------------------------------------------------------------------- + + #------------------------------------------------------------------------------- +@@ -122,7 +122,7 @@ + #------------------------------------------------------------------------------- + + use strict; +-use XMLTV::Version '$Id: tv_grab_huro.in,v 1.45 2011/04/12 19:05:34 dekarl Exp $'; ++use XMLTV::Version '$Id: tv_grab_huro.in,v 1.48 2012/06/19 06:32:25 dekarl Exp $'; + use XMLTV::Capabilities qw/baseline manualconfig cache/; + use XMLTV::Description 'Hungary/Romania'; + use XMLTV::Supplement qw/GetSupplement/; +@@ -338,7 +338,7 @@ + $data =~ s|||g; + $data =~ s|
.*?
||g; + # strip links to divido.hu +- $data =~ s|||g; ++ $data =~ s|||g; + + $tree = HTML::TreeBuilder->new_from_content($data) or + die "could not fetch/parse $url (progamtable)\n"; +@@ -482,11 +482,18 @@ + # the column can hold following type of data: + # begin time | title | long desc | url | category + +- if ($col->attr("colspan") && (my $begin_time = $col->look_down("_tag"=>"p", "class"=>"begin_time" ))) ++ my $begin_time; ++ # this matches the currently running programme only: ++ if ($col->attr("colspan") && ($begin_time = $col->look_down("_tag"=>"p", "class"=>"begin_time" ))) + { + $_ = $begin_time->as_text(); ++ } elsif ($begin_time = $col->look_down("_tag"=>"td", "class"=>"time_container")) { ++ $_ = $begin_time->look_down("_tag"=>"div")->as_text(); + } else { + $_ = $col->as_text(); ++ $_ =~ tr/\xA0/ /; ++ $_ =~ s/^\s+//; ++ $_ =~ s/\s+$//; + } + s/^\s+//;s/\s+$//; + +@@ -546,7 +553,7 @@ + # New type of row: contains only the time of the event + # but not the actual program data. So in this case we try to + # jump to the next row +- if (! $row->attr("class") || (not $row->attr("class") =~ /^event_/ )) { ++ if (! $row->attr("class") || (not $row->attr("class") =~ /[\s]*event_/ )) { + t "found line without event, the time is: $lasttimeHHMM"; + next; + }