Merge lp:~mniess/ubuntu/trusty/totem/fix-lp1292262 into lp:ubuntu/trusty/totem

[Matthias Niess]

The subtitle downloader plugin in totem does not work (LP: #1292262).
The bug has been fixed upstream. This patch incorporates the fix.

[lp:~mniess/ubuntu/trusty/totem/fix-lp1292262]

32. By Matthias Niess on 2014-03-24

target trusty and add dep-3 patch header

[Jackson Doak (noskcaj)]

All the changes look ok, approve from me.

review: Approve

[Sebastien Bacher (seb128)]

Thanks for the work, I renamed the patch to start with "git-" since those fixes are upstream and it helps to know what is coming from there/can we dropped later. I've also commited to the right vcs which is lp:~ubuntu-desktop/totem/ubuntu (see Vcs-Bzr in the control file, or the apt-get source output)

review: Approve

[Matthias Niess (mniess)]

Thanks. I'll make sure to look at that next time!

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-20 11:40:43 +0000
+++ debian/changelog	2014-03-24 21:10:55 +0000
@@ -1,3 +1,11 @@
+totem (3.10.1-1ubuntu4) trusty; urgency=medium
+
+  * debian/patches/94-fix-subtitle-downloader.patch:
+    - missing dependency in opensubtitles.py and bad argument passed
+      to PyGObject (LP: #1292262)
+
+ -- Matthias Niess <[e-mail]>  Sun, 23 Mar 2014 17:06:05 +0100
+
 totem (3.10.1-1ubuntu3) trusty; urgency=medium
 
   * Include the version of libgstreamer1.0-0 in apport reports. Thanks,

=== added file 'debian/patches/94-fix-subtitle-downloader.patch'
--- debian/patches/94-fix-subtitle-downloader.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/94-fix-subtitle-downloader.patch	2014-03-24 21:10:55 +0000
@@ -0,0 +1,30 @@
+Description: adds a missing library import and circumvents an
+ incompatibility between totem 3.10 and pygobject 3.11
+Author: Matthias Niess
+Origin: vendor
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=724093
+Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1292262
+Forwarded: not-needed
+
+Index: fix-lp1292262/src/plugins/opensubtitles/opensubtitles.py
+===================================================================
+--- fix-lp1292262.orig/src/plugins/opensubtitles/opensubtitles.py	2014-03-23 17:02:37.229660000 +0100
++++ fix-lp1292262/src/plugins/opensubtitles/opensubtitles.py	2014-03-23 17:05:57.629681060 +0100
+@@ -1,7 +1,7 @@
+ # -*- coding: utf-8 -*-
+ 
+ from gi.repository import GObject, Peas, Gtk, Gdk # pylint: disable-msg=E0611
+-from gi.repository import Gio, Pango, Totem # pylint: disable-msg=E0611
++from gi.repository import GLib, Gio, Pango, Totem # pylint: disable-msg=E0611
+ 
+ import xmlrpclib
+ import threading
+@@ -438,7 +438,7 @@
+         builder = Totem.plugin_load_interface ("opensubtitles",
+                                                "opensubtitles.ui", True,
+                                                self._totem.get_main_window (),
+-                                               self)
++                                               None)
+ 
+         # Obtain all the widgets we need to initialize
+         combobox = builder.get_object ('language_combobox')

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-23 18:34:50 +0000
+++ debian/patches/series	2014-03-24 21:10:55 +0000
@@ -3,3 +3,4 @@
 92_gst-plugins-good.patch
 93_grilo_optional.patch
 revert_shell_menu.patch
+94-fix-subtitle-downloader.patch