Merge lp:~jpds/totem/fix_345244 into lp:~ubuntu-desktop/totem/ubuntu

Proposed by Jonathan Davies
Status: Merged
Merged at revision: 5
Proposed branch: lp:~jpds/totem/fix_345244
Merge into: lp:~ubuntu-desktop/totem/ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp:~jpds/totem/fix_345244
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Ubuntu Desktop Pending
Review via email: mp+5013@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-03-16 19:39:22 +0000
3+++ debian/changelog 2009-03-29 13:07:21 +0000
4@@ -1,3 +1,10 @@
5+totem (2.26.0-0ubuntu2) jaunty; urgency=low
6+
7+ * Added 67_fix_opensubs_gettext.patch: Backported upstream to fix gettext
8+ declaration in opensubtitle's plugin source (LP: #345244).
9+
10+ -- Jonathan Davies <jpds@ubuntu.com> Sun, 29 Mar 2009 14:05:47 +0100
11+
12 totem (2.26.0-0ubuntu1) jaunty; urgency=low
13
14 * New upstream release (LP: #343843):
15
16=== added file 'debian/patches/67_fix_opensubs_gettext.patch'
17--- debian/patches/67_fix_opensubs_gettext.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/67_fix_opensubs_gettext.patch 2009-03-29 13:07:21 +0000
19@@ -0,0 +1,21 @@
20+Index: ./src/plugins/opensubtitles/opensubtitles.py
21+===================================================================
22+--- ./src/plugins/opensubtitles/opensubtitles.py
23++++ ./src/plugins/opensubtitles/opensubtitles.py
24+@@ -1,5 +1,6 @@
25+ import totem
26+ import gobject, gtk, gio, gconf
27++import gettext
28+ gobject.threads_init()
29+ import xmlrpclib
30+ import threading
31+@@ -8,6 +9,8 @@
32+
33+ from hash import hashFile
34+
35++D_ = gettext.dgettext
36++
37+ USER_AGENT = 'Totem'
38+ OK200 = '200 OK'
39+ TOTEM_REMOTE_COMMAND_REPLACE = 14
40+
41
42=== modified file 'debian/patches/series'
43--- debian/patches/series 2009-03-09 17:02:51 +0000
44+++ debian/patches/series 2009-03-29 13:07:21 +0000
45@@ -4,4 +4,5 @@
46 60_build_libbaconvideowidget_statically.patch
47 65_bbc-plugin.patch
48 66_show-cover-image.patch
49+67_fix_opensubs_gettext.patch
50 70_autotools.patch

Subscribers

People subscribed via source and target branches