Ubuntu
emesene package

Merge lp:~jconti/ubuntu/precise/emesene/fix-956422 into lp:ubuntu/precise/emesene

  1. Precise (12.04)
  2. fix-956422
  3. Merge into precise
Proposed by Jason Conti
Status: Merged
Merged at revision: 25
Proposed branch: lp:~jconti/ubuntu/precise/emesene/fix-956422
Merge into: lp:ubuntu/precise/emesene
Diff against target: 407 lines (+372/-1)
5 files modified
debian/changelog (+17/-0)
debian/control (+1/-1)
debian/patches/01_port_to_farstream.patch (+327/-0)
debian/patches/02_fix_common_errback.patch (+25/-0)
debian/patches/series (+2/-0)
To merge this branch: bzr merge lp:~jconti/ubuntu/precise/emesene/fix-956422
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+97947@code.launchpad.net

Description of the change

This branch includes two patches. The first, 01_port_to_farstream.patch, updates all the symbols referenced in two of the emesene papylib files to use farstream instead of farsight, which causes package conflicts with empathy and based on bug 954026 may be removed soon.

The second cherry picks a fix from the upstream git which I encountered while testing the above patch. It doesn't have a launchpad bug number, but I can submit the apport crash if necessary. Corrects the number of arguments passed to __common_errback.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

That looks fine, thanks!

review: Approve
Revision history for this message
Martin Pitt (pitti) wrote :

I'll fix the changelog during merging (no need for two version numbers/records).

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 2012-01-22 22:22:23 +0000
3+++ debian/changelog 2012-03-16 18:04:24 +0000
4@@ -1,3 +1,20 @@
5+emesene (2.12.1+dfsg-1ubuntu3) precise; urgency=low
6+
7+ * debian/patches/02_fix_common_errback.patch:
8+ - Cherry pick 3b289b25a77c6531a7de7863f049bc30ca7d4c78 from upstream
9+ git to fix incorrect number of arguments causing an exception.
10+
11+ -- Jason Conti <jason.conti@gmail.com> Fri, 16 Mar 2012 12:57:24 -0400
12+
13+emesene (2.12.1+dfsg-1ubuntu2) precise; urgency=low
14+
15+ * debian/control:
16+ - Change python-farsight to python-farstream depend.
17+ * debian/patches/port_to_farstream.patch:
18+ - Rename farsight to farstream (LP: #956422)
19+
20+ -- Jason Conti <jason.conti@gmail.com> Thu, 15 Mar 2012 14:44:01 -0400
21+
22 emesene (2.12.1+dfsg-1ubuntu1) precise; urgency=low
23
24 * Merge from Debian testing (main).
25
26=== modified file 'debian/control'
27--- debian/control 2011-10-29 15:22:42 +0000
28+++ debian/control 2012-03-16 18:04:24 +0000
29@@ -26,7 +26,7 @@
30 python-openssl (>= 0.6),
31 python-crypto,
32 python-gst0.10,
33- python-farsight
34+ python-farstream
35 Recommends: python-xmpp, indicator-status-provider-emesene
36 Suggests: python-gtkspell
37 Description: instant messaging client
38
39=== added directory 'debian/patches'
40=== added file 'debian/patches/01_port_to_farstream.patch'
41--- debian/patches/01_port_to_farstream.patch 1970-01-01 00:00:00 +0000
42+++ debian/patches/01_port_to_farstream.patch 2012-03-16 18:04:24 +0000
43@@ -0,0 +1,327 @@
44+Description: Port to farstream
45+ Farsight2 was renamed farstream upstream. The symbols are the same except for
46+ a mass renaming of farsight to farstream in the namespace and signals.
47+Author: Jason Conti <jason.conti@gmail.com>
48+Bug-Ubuntu: https://launchpad.net/bugs/956422
49+Last-Update: 2012-03-15
50+
51+--- emesene-2.12.1+dfsg.orig/emesene/e3/papylib/PapyConference.py
52++++ emesene-2.12.1+dfsg/emesene/e3/papylib/PapyConference.py
53+@@ -24,7 +24,7 @@ from papyon.event.media import *
54+ import pygst
55+ pygst.require('0.10')
56+
57+-import farsight
58++import farstream
59+ import gobject
60+ import gst
61+ import logging
62+@@ -33,44 +33,44 @@ logger = logging.getLogger("papylib.conf
63+
64+ codecs_definitions = {
65+ "audio" : [
66+- (114, "x-msrta", farsight.MEDIA_TYPE_AUDIO, 16000),
67+- (111, "SIREN", farsight.MEDIA_TYPE_AUDIO, 16000),
68+- (112, "G7221", farsight.MEDIA_TYPE_AUDIO, 16000),
69+- (115, "x-msrta", farsight.MEDIA_TYPE_AUDIO, 8000),
70+- (116, "SIREN", farsight.MEDIA_TYPE_AUDIO, 8000),
71+- (4, "G723", farsight.MEDIA_TYPE_AUDIO, 8000),
72+- (8, "PCMA", farsight.MEDIA_TYPE_AUDIO, 8000),
73+- (0, "PCMU", farsight.MEDIA_TYPE_AUDIO, 8000),
74+- (97, "RED", farsight.MEDIA_TYPE_AUDIO, 8000),
75+- (101, "telephone-event", farsight.MEDIA_TYPE_AUDIO, 8000)
76++ (114, "x-msrta", farstream.MEDIA_TYPE_AUDIO, 16000),
77++ (111, "SIREN", farstream.MEDIA_TYPE_AUDIO, 16000),
78++ (112, "G7221", farstream.MEDIA_TYPE_AUDIO, 16000),
79++ (115, "x-msrta", farstream.MEDIA_TYPE_AUDIO, 8000),
80++ (116, "SIREN", farstream.MEDIA_TYPE_AUDIO, 8000),
81++ (4, "G723", farstream.MEDIA_TYPE_AUDIO, 8000),
82++ (8, "PCMA", farstream.MEDIA_TYPE_AUDIO, 8000),
83++ (0, "PCMU", farstream.MEDIA_TYPE_AUDIO, 8000),
84++ (97, "RED", farstream.MEDIA_TYPE_AUDIO, 8000),
85++ (101, "telephone-event", farstream.MEDIA_TYPE_AUDIO, 8000)
86+ ],
87+ "video" : [
88+- (121, "x-rtvc1", farsight.MEDIA_TYPE_VIDEO, 90000),
89+- (34, "H263", farsight.MEDIA_TYPE_VIDEO, 90000)
90++ (121, "x-rtvc1", farstream.MEDIA_TYPE_VIDEO, 90000),
91++ (34, "H263", farstream.MEDIA_TYPE_VIDEO, 90000)
92+ ]
93+ }
94+
95+ types = {
96+ 0 : None,
97+- farsight.CANDIDATE_TYPE_HOST : "host",
98+- farsight.CANDIDATE_TYPE_SRFLX : "srflx",
99+- farsight.CANDIDATE_TYPE_PRFLX : "prflx",
100+- farsight.CANDIDATE_TYPE_RELAY : "relay"
101++ farstream.CANDIDATE_TYPE_HOST : "host",
102++ farstream.CANDIDATE_TYPE_SRFLX : "srflx",
103++ farstream.CANDIDATE_TYPE_PRFLX : "prflx",
104++ farstream.CANDIDATE_TYPE_RELAY : "relay"
105+ }
106+
107+ protos = {
108+- farsight.NETWORK_PROTOCOL_TCP : "TCP",
109+- farsight.NETWORK_PROTOCOL_UDP : "UDP"
110++ farstream.NETWORK_PROTOCOL_TCP : "TCP",
111++ farstream.NETWORK_PROTOCOL_UDP : "UDP"
112+ }
113+
114+ media_names = {
115+- farsight.MEDIA_TYPE_AUDIO : "audio",
116+- farsight.MEDIA_TYPE_VIDEO : "video"
117++ farstream.MEDIA_TYPE_AUDIO : "audio",
118++ farstream.MEDIA_TYPE_VIDEO : "video"
119+ }
120+
121+ media_types = {
122+- "audio" : farsight.MEDIA_TYPE_AUDIO,
123+- "video" : farsight.MEDIA_TYPE_VIDEO
124++ "audio" : farstream.MEDIA_TYPE_AUDIO,
125++ "video" : farstream.MEDIA_TYPE_VIDEO
126+ }
127+
128+
129+@@ -130,9 +130,9 @@ class MediaSessionHandler(MediaSessionEv
130+ if s.has_name("prepare-xwindow-id"):
131+ # Sets buddy's xid in our nice window.
132+ msg.src.set_xwindow_id(self.surface_buddy)
133+- if s.has_name("farsight-error"):
134++ if s.has_name("farstream-error"):
135+ logger.error("Farsight error : %s" % s['error-msg'])
136+- if s.has_name("farsight-codecs-changed"):
137++ if s.has_name("farstream-codecs-changed"):
138+ logger.debug("Farsight codecs changed")
139+ ret = gst.BUS_DROP
140+ ready = s["session"].get_property("codecs-ready")
141+@@ -141,21 +141,21 @@ class MediaSessionHandler(MediaSessionEv
142+ name = media_names[s["session"].get_property("media-type")]
143+ stream = self._session.get_stream(name)
144+ stream.set_local_codecs(convert_fs_codecs(codecs))
145+- if s.has_name("farsight-new-local-candidate"):
146++ if s.has_name("farstream-new-local-candidate"):
147+ logger.debug("New local candidate")
148+ ret = gst.BUS_DROP
149+ name = media_names[s["stream"].get_property("session").get_property("media-type")]
150+ candidate = convert_fs_candidate(s["candidate"])
151+ stream = self._session.get_stream(name)
152+ stream.new_local_candidate(candidate)
153+- if s.has_name("farsight-local-candidates-prepared"):
154++ if s.has_name("farstream-local-candidates-prepared"):
155+ logger.debug("Local candidates are prepared")
156+ ret = gst.BUS_DROP
157+ type = s["stream"].get_property("session").get_property("media-type")
158+ name = media_names[type]
159+ stream = self._session.get_stream(name)
160+ stream.local_candidates_prepared()
161+- if s.has_name("farsight-new-active-candidate-pair"):
162++ if s.has_name("farstream-new-active-candidate-pair"):
163+ logger.debug("New active candidate pair")
164+ ret = gst.BUS_DROP
165+ type = s["stream"].get_property("session").get_property("media-type")
166+@@ -244,7 +244,7 @@ class MediaStreamHandler(MediaStreamEven
167+ # Farsight utility functions
168+
169+ def create_notifier(pipeline, filename):
170+- notifier = farsight.ElementAddedNotifier()
171++ notifier = farstream.ElementAddedNotifier()
172+ notifier.add(pipeline)
173+ notifier.set_properties_from_file(filename)
174+ return notifier
175+@@ -267,14 +267,14 @@ def convert_fs_candidate(fscandidate):
176+ def convert_media_candidates(candidates):
177+ fscandidates = []
178+ for candidate in candidates:
179+- proto = farsight.NETWORK_PROTOCOL_TCP
180++ proto = farstream.NETWORK_PROTOCOL_TCP
181+ if candidate.transport == "UDP":
182+- proto = farsight.NETWORK_PROTOCOL_UDP
183++ proto = farstream.NETWORK_PROTOCOL_UDP
184+ type = 0
185+ for k,v in types.iteritems():
186+ if v == candidate.type:
187+ type = k
188+- fscandidate = farsight.Candidate()
189++ fscandidate = farstream.Candidate()
190+ fscandidate.foundation = candidate.foundation
191+ fscandidate.ip = candidate.ip
192+ fscandidate.port = candidate.port
193+@@ -290,7 +290,7 @@ def convert_media_candidates(candidates)
194+ def build_codecs(type):
195+ codecs = []
196+ for args in codecs_definitions[type]:
197+- codec = farsight.Codec(*args)
198++ codec = farstream.Codec(*args)
199+ codecs.append(codec)
200+ return codecs
201+
202+@@ -309,7 +309,7 @@ def convert_media_codecs(codecs, name):
203+ fscodecs = []
204+ media_type = media_types[name]
205+ for codec in codecs:
206+- fscodec = farsight.Codec(
207++ fscodec = farstream.Codec(
208+ codec.payload,
209+ codec.encoding,
210+ media_type,
211+--- emesene-2.12.1+dfsg.orig/emesene/e3/papylib/papyon/papyon/media/conference.py
212++++ emesene-2.12.1+dfsg/emesene/e3/papylib/papyon/papyon/media/conference.py
213+@@ -24,7 +24,7 @@ from papyon.event.media import *
214+ import pygst
215+ pygst.require('0.10')
216+
217+-import farsight
218++import farstream
219+ import gobject
220+ import gst
221+ import logging
222+@@ -34,44 +34,44 @@ logger = logging.getLogger("papyon.media
223+
224+ codecs_definitions = {
225+ "audio" : [
226+- (114, "x-msrta", farsight.MEDIA_TYPE_AUDIO, 16000),
227+- (111, "SIREN", farsight.MEDIA_TYPE_AUDIO, 16000),
228+- (112, "G7221", farsight.MEDIA_TYPE_AUDIO, 16000),
229+- (115, "x-msrta", farsight.MEDIA_TYPE_AUDIO, 8000),
230+- (116, "SIREN", farsight.MEDIA_TYPE_AUDIO, 8000),
231+- (4, "G723", farsight.MEDIA_TYPE_AUDIO, 8000),
232+- (8, "PCMA", farsight.MEDIA_TYPE_AUDIO, 8000),
233+- (0, "PCMU", farsight.MEDIA_TYPE_AUDIO, 8000),
234+- (97, "RED", farsight.MEDIA_TYPE_AUDIO, 8000),
235+- (101, "telephone-event", farsight.MEDIA_TYPE_AUDIO, 8000)
236++ (114, "x-msrta", farstream.MEDIA_TYPE_AUDIO, 16000),
237++ (111, "SIREN", farstream.MEDIA_TYPE_AUDIO, 16000),
238++ (112, "G7221", farstream.MEDIA_TYPE_AUDIO, 16000),
239++ (115, "x-msrta", farstream.MEDIA_TYPE_AUDIO, 8000),
240++ (116, "SIREN", farstream.MEDIA_TYPE_AUDIO, 8000),
241++ (4, "G723", farstream.MEDIA_TYPE_AUDIO, 8000),
242++ (8, "PCMA", farstream.MEDIA_TYPE_AUDIO, 8000),
243++ (0, "PCMU", farstream.MEDIA_TYPE_AUDIO, 8000),
244++ (97, "RED", farstream.MEDIA_TYPE_AUDIO, 8000),
245++ (101, "telephone-event", farstream.MEDIA_TYPE_AUDIO, 8000)
246+ ],
247+ "video" : [
248+- (121, "x-rtvc1", farsight.MEDIA_TYPE_VIDEO, 90000),
249+- (34, "H263", farsight.MEDIA_TYPE_VIDEO, 90000)
250++ (121, "x-rtvc1", farstream.MEDIA_TYPE_VIDEO, 90000),
251++ (34, "H263", farstream.MEDIA_TYPE_VIDEO, 90000)
252+ ]
253+ }
254+
255+ types = {
256+ 0 : None,
257+- farsight.CANDIDATE_TYPE_HOST : "host",
258+- farsight.CANDIDATE_TYPE_SRFLX : "srflx",
259+- farsight.CANDIDATE_TYPE_PRFLX : "prflx",
260+- farsight.CANDIDATE_TYPE_RELAY : "relay"
261++ farstream.CANDIDATE_TYPE_HOST : "host",
262++ farstream.CANDIDATE_TYPE_SRFLX : "srflx",
263++ farstream.CANDIDATE_TYPE_PRFLX : "prflx",
264++ farstream.CANDIDATE_TYPE_RELAY : "relay"
265+ }
266+
267+ protos = {
268+- farsight.NETWORK_PROTOCOL_TCP : "TCP",
269+- farsight.NETWORK_PROTOCOL_UDP : "UDP"
270++ farstream.NETWORK_PROTOCOL_TCP : "TCP",
271++ farstream.NETWORK_PROTOCOL_UDP : "UDP"
272+ }
273+
274+ media_names = {
275+- farsight.MEDIA_TYPE_AUDIO : "audio",
276+- farsight.MEDIA_TYPE_VIDEO : "video"
277++ farstream.MEDIA_TYPE_AUDIO : "audio",
278++ farstream.MEDIA_TYPE_VIDEO : "video"
279+ }
280+
281+ media_types = {
282+- "audio" : farsight.MEDIA_TYPE_AUDIO,
283+- "video" : farsight.MEDIA_TYPE_VIDEO
284++ "audio" : farstream.MEDIA_TYPE_AUDIO,
285++ "video" : farstream.MEDIA_TYPE_VIDEO
286+ }
287+
288+
289+@@ -125,9 +125,9 @@ class MediaSessionHandler(MediaSessionEv
290+ ret = gst.BUS_PASS
291+ if msg.type == gst.MESSAGE_ELEMENT:
292+ s = msg.structure
293+- if s.has_name("farsight-error"):
294++ if s.has_name("farstream-error"):
295+ logger.error("Farsight error : %s" % s['error-msg'])
296+- if s.has_name("farsight-codecs-changed"):
297++ if s.has_name("farstream-codecs-changed"):
298+ logger.debug("Farsight codecs changed")
299+ ret = gst.BUS_DROP
300+ ready = s["session"].get_property("codecs-ready")
301+@@ -136,21 +136,21 @@ class MediaSessionHandler(MediaSessionEv
302+ name = media_names[s["session"].get_property("media-type")]
303+ stream = self._session.get_stream(name)
304+ stream.set_local_codecs(convert_fs_codecs(codecs))
305+- if s.has_name("farsight-new-local-candidate"):
306++ if s.has_name("farstream-new-local-candidate"):
307+ logger.debug("New local candidate")
308+ ret = gst.BUS_DROP
309+ name = media_names[s["stream"].get_property("session").get_property("media-type")]
310+ candidate = convert_fs_candidate(s["candidate"])
311+ stream = self._session.get_stream(name)
312+ stream.new_local_candidate(candidate)
313+- if s.has_name("farsight-local-candidates-prepared"):
314++ if s.has_name("farstream-local-candidates-prepared"):
315+ logger.debug("Local candidates are prepared")
316+ ret = gst.BUS_DROP
317+ type = s["stream"].get_property("session").get_property("media-type")
318+ name = media_names[type]
319+ stream = self._session.get_stream(name)
320+ stream.local_candidates_prepared()
321+- if s.has_name("farsight-new-active-candidate-pair"):
322++ if s.has_name("farstream-new-active-candidate-pair"):
323+ logger.debug("New active candidate pair")
324+ ret = gst.BUS_DROP
325+ type = s["stream"].get_property("session").get_property("media-type")
326+@@ -223,7 +223,7 @@ class MediaStreamHandler(MediaStreamEven
327+ # Farsight utility functions
328+
329+ def create_notifier(pipeline, filename):
330+- notifier = farsight.ElementAddedNotifier()
331++ notifier = farstream.ElementAddedNotifier()
332+ notifier.add(pipeline)
333+ notifier.set_properties_from_file(filename)
334+ return notifier
335+@@ -246,14 +246,14 @@ def convert_fs_candidate(fscandidate):
336+ def convert_media_candidates(candidates):
337+ fscandidates = []
338+ for candidate in candidates:
339+- proto = farsight.NETWORK_PROTOCOL_TCP
340++ proto = farstream.NETWORK_PROTOCOL_TCP
341+ if candidate.transport == "UDP":
342+- proto = farsight.NETWORK_PROTOCOL_UDP
343++ proto = farstream.NETWORK_PROTOCOL_UDP
344+ type = 0
345+ for k,v in types.iteritems():
346+ if v == candidate.type:
347+ type = k
348+- fscandidate = farsight.Candidate()
349++ fscandidate = farstream.Candidate()
350+ fscandidate.foundation = candidate.foundation
351+ fscandidate.ip = candidate.ip
352+ fscandidate.port = candidate.port
353+@@ -269,7 +269,7 @@ def convert_media_candidates(candidates)
354+ def build_codecs(type):
355+ codecs = []
356+ for args in codecs_definitions[type]:
357+- codec = farsight.Codec(*args)
358++ codec = farstream.Codec(*args)
359+ codecs.append(codec)
360+ return codecs
361+
362+@@ -288,7 +288,7 @@ def convert_media_codecs(codecs, name):
363+ fscodecs = []
364+ media_type = media_types[name]
365+ for codec in codecs:
366+- fscodec = farsight.Codec(
367++ fscodec = farstream.Codec(
368+ codec.payload,
369+ codec.encoding,
370+ media_type,
371
372=== added file 'debian/patches/02_fix_common_errback.patch'
373--- debian/patches/02_fix_common_errback.patch 1970-01-01 00:00:00 +0000
374+++ debian/patches/02_fix_common_errback.patch 2012-03-16 18:04:24 +0000
375@@ -0,0 +1,25 @@
376+From: "Sven (Sbte)" <svenb.linux@gmail.com>
377+Date: Sun, 26 Feb 2012 12:34:09 +0100
378+Subject: [PATCH] papyon: Pass the right number of arguments to __common_errback
379+
380+Origin: upstream, https://github.com/emesene/emesene/commit/3b289b25a77c6531a7de7863f049bc30ca7d4c78
381+---
382+ .../service/ContentRoaming/content_roaming.py | 2 +-
383+ 1 files changed, 1 insertions(+), 1 deletions(-)
384+
385+diff --git a/emesene/e3/papylib/papyon/papyon/service/ContentRoaming/content_roaming.py b/emesene/e3/papylib/papyon/papyon/service/ContentRoaming/content_roaming.py
386+index 5bb2d35..a9c127a 100644
387+--- a/emesene/e3/papylib/papyon/papyon/service/ContentRoaming/content_roaming.py
388++++ b/emesene/e3/papylib/papyon/papyon/service/ContentRoaming/content_roaming.py
389+@@ -114,7 +114,7 @@ class ContentRoaming(gobject.GObject):
390+ gp = GetStoredProfileScenario(self._storage,
391+ (self.__get_dn_and_pm_cb,),
392+ (self.__get_display_picture_cb,),
393+- (self.__common_errback,))
394++ (self.__common_errback, None))
395+ gp.cid = self._ab.profile.cid
396+ gp()
397+
398+--
399+1.7.9.1
400+
401
402=== added file 'debian/patches/series'
403--- debian/patches/series 1970-01-01 00:00:00 +0000
404+++ debian/patches/series 2012-03-16 18:04:24 +0000
405@@ -0,0 +1,2 @@
406+01_port_to_farstream.patch
407+02_fix_common_errback.patch

Subscribers

People subscribed via source and target branches

to all changes: