diff -u totem-2.26.1/debian/changelog totem-2.26.1/debian/changelog --- totem-2.26.1/debian/changelog +++ totem-2.26.1/debian/changelog @@ -1,3 +1,10 @@ +totem (2.26.1-0ubuntu5.1) jaunty-proposed; urgency=low + + * debian/patches/06_youtube_regex.patch: + - Update regex to make youtube plugin works again. (LP: #459423) + + -- Saïvann Carignan Sat, 07 Nov 2009 22:56:45 -0500 + totem (2.26.1-0ubuntu5) jaunty; urgency=low * debian/totem-mozilla.links: diff -u totem-2.26.1/debian/patches/series totem-2.26.1/debian/patches/series --- totem-2.26.1/debian/patches/series +++ totem-2.26.1/debian/patches/series @@ -1,5 +1,6 @@ 02_lpi.patch 04_desktop_gettext_domain.patch +06_youtube_regex.patch 20_use_alternatives.patch 60_build_libbaconvideowidget_statically.patch 65_bbc-plugin.patch only in patch2: unchanged: --- totem-2.26.1.orig/debian/patches/06_youtube_regex.patch +++ totem-2.26.1/debian/patches/06_youtube_regex.patch @@ -0,0 +1,21 @@ +#Description: Fix regex to work with latest changes in youtube website. +--- a/src/plugins/youtube/youtube.py 2009-03-16 06:40:04.000000000 -0400 ++++ b/src/plugins/youtube/youtube.py 2009-11-07 22:50:55.990598692 -0500 +@@ -204,7 +204,7 @@ + def resolve_t_param (self, youtube_id): + """We have to get the t parameter from the actual video page, since Google changed how their URLs work""" + stream = urllib.urlopen ("http://youtube.com/watch?v=" + urllib.quote (youtube_id)) +- regexp1 = re.compile ("swfArgs.*\"t\": \"([^\"]+)\"") ++ regexp1 = re.compile ("'SWF_ARGS'.*\"t\": \"([^\"]+)\"") + regexp2 = re.compile ("") + + contents = stream.read () +@@ -334,7 +334,7 @@ + t_param = self.resolve_t_param (youtube_id) + + if t_param != "": +- mrl = "http://www.youtube.com/get_video?video_id=" + urllib.quote (youtube_id) + "&t=" + urllib.quote (t_param) + self.get_fmt_string () ++ mrl = "http://www.youtube.com/get_video?video_id=" + urllib.quote (youtube_id) + "&t=" + t_param + self.get_fmt_string () + + gobject.idle_add (self._append_to_liststore, treeview_name, pixbuf, entry.title.text, mrl, youtube_id, search_token) +