tags 662964 + patch tags 662964 + pending tags 664929 + patch tags 664929 + pending thanks
Dear maintainer, I've prepared an NMU for ekiga (versioned as 3.2.7-4.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer or if I can upload without delay. Regards. -- Mehdi Dogguy
diff -Nru ekiga-3.2.7/debian/changelog ekiga-3.2.7/debian/changelog --- ekiga-3.2.7/debian/changelog 2011-10-17 13:00:44.000000000 +0200 +++ ekiga-3.2.7/debian/changelog 2012-04-05 11:53:51.000000000 +0200 @@ -1,3 +1,12 @@ +ekiga (3.2.7-4.2) unstable; urgency=high + + * Non-maintainer upload. + * Fix FTBFS due to API changes in Opal 3.10 (Closes: #664929, #662964) + - add debian/patches/opal310.patch + * Set urgency to "high" to fix RC bugs. + + -- Mehdi Dogguy <me...@debian.org> Thu, 05 Apr 2012 11:51:01 +0200 + ekiga (3.2.7-4.1) unstable; urgency=low * Non-maintainer upload. @@ -789,5 +798,3 @@ * Initial Release. (Closes: #103474) -- Sander Smeenk <ssme...@debian.org> Wed, 4 Jul 2001 14:03:24 +0200 - - diff -Nru ekiga-3.2.7/debian/patches/opal310.patch ekiga-3.2.7/debian/patches/opal310.patch --- ekiga-3.2.7/debian/patches/opal310.patch 1970-01-01 01:00:00.000000000 +0100 +++ ekiga-3.2.7/debian/patches/opal310.patch 2012-04-05 11:50:56.000000000 +0200 @@ -0,0 +1,79 @@ +Author: Mehdi Dogguy <me...@debian.org> +Subject: Cope with API changes in Opal 3.10 + + http://git.gnome.org/browse/ekiga/commit/lib/engine/components/opal/opal-call.cpp?id=34d9b995344eca38afa083b10a6c864c15848b9a + http://git.gnome.org/browse/ekiga/commit/lib/engine/components/opal/opal-call.cpp?id=72d7b95bd8df3b6673e175195d9ba2b8abef5c0e + http://git.gnome.org/browse/ekiga/commit/lib/engine/components/opal/sip-endpoint.cpp?id=8c02582bdfa81ea0154572549fbfc319811a72f1 + +Origin: upstream +Bug-Debian: http://bugs.debian.org/664929 + +--- a/lib/engine/components/opal/opal-call.cpp ++++ b/lib/engine/components/opal/opal-call.cpp +@@ -154,11 +154,11 @@ + PSafePtr<OpalConnection> connection = get_remote_connection (); + if (connection != NULL) { + +- on_hold = connection->IsConnectionOnHold (); ++ on_hold = connection->IsOnHold (false); + if (!on_hold) +- connection->HoldConnection (); ++ connection->Hold (false, true); + else +- connection->RetrieveConnection (); ++ connection->Hold (false, false); + } + } + +@@ -477,7 +477,6 @@ + case OpalConnection::EndedByNoRingBackTone: + case OpalConnection::EndedByOutOfService: + case OpalConnection::EndedByAcceptingCallWaiting: +- case OpalConnection::EndedWithQ931Code: + case OpalConnection::NumCallEndReasons: + default : + reason = _("Call completed"); +--- a/lib/engine/components/opal/sip-endpoint.cpp ++++ b/lib/engine/components/opal/sip-endpoint.cpp +@@ -352,7 +352,11 @@ + { + if (!_uri.empty () && (_uri.find ("sip:") == 0 || _uri.find (':') == string::npos) && !_message.empty ()) { + +- SIPEndPoint::Message (_uri, _message); ++ OpalIM im; ++ im.m_to = PURL (_uri); ++ im.m_mimeType = "text/plain;charset=UTF-8"; ++ im.m_body = _message; ++ Message(im); + + return true; + } +@@ -940,6 +944,7 @@ + } + + ++#if 0 + void + Opal::Sip::EndPoint::OnMessageFailed (const SIPURL & messageUrl, + SIP_PDU::StatusCodes /*reason*/) +@@ -953,6 +958,7 @@ + uri, display_name, + _("Could not send message"))); + } ++#endif + + + SIPURL +--- a/lib/engine/components/opal/sip-endpoint.h ++++ b/lib/engine/components/opal/sip-endpoint.h +@@ -180,8 +180,10 @@ + bool OnReceivedMESSAGE (OpalTransport & transport, + SIP_PDU & pdu); + ++#if 0 + void OnMessageFailed (const SIPURL & messageUrl, + SIP_PDU::StatusCodes reason); ++#endif + + SIPURL GetRegisteredPartyName (const SIPURL & host, + const OpalTransport & transport); diff -Nru ekiga-3.2.7/debian/patches/series ekiga-3.2.7/debian/patches/series --- ekiga-3.2.7/debian/patches/series 2011-10-17 13:03:47.000000000 +0200 +++ ekiga-3.2.7/debian/patches/series 2012-04-05 11:42:29.000000000 +0200 @@ -1,2 +1,3 @@ libnotify0.7.patch fix-linux-gnueabihf-build.patch +opal310.patch
