Package: release.debian.org User: release.debian....@packages.debian.org UserTags: unblock
The main reason for this unblock request: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771299 This ensures that users can mix-and-match JSCommunicator with newer versions of JsSIP. This is the change to JSCommManager.js in the debdiff. The debdiff also includes changes to the debian/copyright and upstream AUTHORS files to add the translators.
diff -Nru jscommunicator-2.0.1/AUTHORS jscommunicator-2.0.3/AUTHORS --- jscommunicator-2.0.1/AUTHORS 2014-11-08 20:03:43.000000000 +0100 +++ jscommunicator-2.0.3/AUTHORS 2014-11-28 11:06:08.000000000 +0100 @@ -1,12 +1,20 @@ -Daniel Pocock <danielpocock.com> -Juliana Louback <julianalouback.com> -Christian Henz <github.com/chenz> -Jeroen Massar <jeroen.massar.ch> -elprincipe <github.com/elprincipe> -Yehuda Korotkin <github.com/yedako> +Daniel Pocock <http://danielpocock.com> +Juliana Louback <http://julianalouback.com> +Christian Henz <https://github.com/chenz> +Jeroen Massar <http://jeroen.massar.ch> +elprincipe <https://github.com/elprincipe> +Yehuda Korotkin <https://github.com/yedako> Carla Araos <carlaaraos.com> -aavia <github.com/aavia> -mirazusman <github.com/mirazusman> -tehilazi <github.com/tehilazi> -Matías A. Bellone <github.com/toote> -tami4 <github.com/tami4> +aavia <https://github.com/aavia> +mirazusman <https://github.com/mirazusman> +tehilazi <https://github.com/tehilazi> +Matías A. Bellone <https://github.com/toote> +tami4 <https://github.com/tami4> +Christian Henz <chrh...@gmx.de> +Dariusz Dwornikowski <dariusz.dwornikow...@cs.put.poznan.pl> +Ivan Masár <heli...@centrum.sk> +Martin Hristov <martinhris...@abv.bg> +Matías A. Bellone <matiasbellone+l...@gmail.com> +Miguel Ángel Molina <ssl...@gmail.com> +Thomas Vincent <tho...@vinc-net.fr> +timothymctim <timothymc...@users.noreply.github.com> diff -Nru jscommunicator-2.0.1/debian/changelog jscommunicator-2.0.3/debian/changelog --- jscommunicator-2.0.1/debian/changelog 2014-11-08 22:18:54.000000000 +0100 +++ jscommunicator-2.0.3/debian/changelog 2014-11-28 12:22:24.000000000 +0100 @@ -1,3 +1,11 @@ +jscommunicator (2.0.3-1) unstable; urgency=high + + * New upstream release. + * Support for JsSIP 'confirmed' event. (Closes: #771299) + * Update copyright, add translators. + + -- Daniel Pocock <dan...@pocock.pro> Fri, 28 Nov 2014 11:09:40 +0100 + jscommunicator (2.0.1-1) unstable; urgency=medium * New upstream release. diff -Nru jscommunicator-2.0.1/debian/copyright jscommunicator-2.0.3/debian/copyright --- jscommunicator-2.0.1/debian/copyright 2014-11-05 22:09:49.000000000 +0100 +++ jscommunicator-2.0.3/debian/copyright 2014-11-28 12:25:48.000000000 +0100 @@ -7,6 +7,27 @@ 2014, Juliana Louback http://julianalouback.com License: GPL-2+ +Files: internationalization/* +Copyright: 2014, Christian Henz <https://github.com/chenz> + 2014, Jeroen Massar <http://jeroen.massar.ch> + 2014, elprincipe <https://github.com/elprincipe> + 2014, Yehuda Korotkin <https://github.com/yedako> + 2014, Carla Araos <http://carlaaraos.com> + 2014, aavia <https://github.com/aavia> + 2014, mirazusman <https://github.com/mirazusman> + 2014, tehilazi <https://github.com/tehilazi> + 2014, Matías A. Bellone <https://github.com/toote> + 2014, tami4 <https://github.com/tami4> + 2014, Christian Henz <chrh...@gmx.de> + 2014, Dariusz Dwornikowski <dariusz.dwornikow...@cs.put.poznan.pl> + 2014, Ivan Masár <heli...@centrum.sk> + 2014, Martin Hristov <martinhris...@abv.bg> + 2014, Matías A. Bellone <matiasbellone+l...@gmail.com> + 2014, Miguel Ángel Molina <ssl...@gmail.com> + 2014, Thomas Vincent <tho...@vinc-net.fr> + 2014, timothymctim <timothymc...@users.noreply.github.com> +License: GPL-2+ + Files: parseuri.js Copyright: 2007, Steven Levithan <stevenlevithan.com> License: MIT diff -Nru jscommunicator-2.0.1/JSCommManager.js jscommunicator-2.0.3/JSCommManager.js --- jscommunicator-2.0.1/JSCommManager.js 2014-11-08 20:03:43.000000000 +0100 +++ jscommunicator-2.0.3/JSCommManager.js 2014-11-28 11:06:08.000000000 +0100 @@ -380,11 +380,18 @@ Arbiter.publish("jsc/ua/idle", null, {async:true}); }); - call.on('started', function(e) { + var handleConfirmed = function(e) { JSCommUI.session_connect(call, e); // Signal that a call connected Arbiter.publish("jsc/call/connected", null, {async:true}); - }); + }; + // The 'started' event was generated by JsSIP < 0.4.0 + // whereas later versions send 'accepted' and 'confirmed' events + // Discussed in https://github.com/versatica/JsSIP/issues/239 + // One of these two lines will log an error but it proceeds anyway + console.log('only one of the event handlers "confirmed" or "started" will be registered and the other generates a log error which can be ignored'); + call.on('confirmed', handleConfirmed); + call.on('started', handleConfirmed); call.on('newDTMF', function(e) { if (e.data.originator === 'remote') { diff -Nru jscommunicator-2.0.1/jssip-helper.js jscommunicator-2.0.3/jssip-helper.js --- jscommunicator-2.0.1/jssip-helper.js 2014-11-08 20:03:43.000000000 +0100 +++ jscommunicator-2.0.3/jssip-helper.js 2014-11-28 11:06:08.000000000 +0100 @@ -58,7 +58,8 @@ connection_recovery_min_interval: settings.websocket.connection_recovery_min_interval, connection_recovery_max_interval: settings.websocket.connection_recovery_max_interval, hack_via_tcp: false, - hack_ip_in_contact: false + hack_ip_in_contact: false, + log: { level: "debug" } }; return jssip_settings;
