[Pkg-voip-commits] [twinkle] 28/73: Imported Debian patch 1:1.0-1

Peter Colberg pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:48 UTC 2016


This is an automated email from the git hooks/post-receive script.

pc-guest pushed a commit to branch master
in repository twinkle.

commit 0fcc2ac64e029ea1f34f6672259f15d96dbe79a9
Merge: 2bfcba4 2d368ba
Author: Mark Purcell <msp at debian.org>
Date:   Thu Jan 25 22:32:22 2007 +0000

    Imported Debian patch 1:1.0-1

 ChangeLog                                 |   11 +-
 NEWS                                      |   11 +-
 configure                                 |    4 +-
 configure.in                              |    4 +-
 debian/changelog                          |   13 +
 debian/control                            |   42 +-
 debian/patches/extra-qualifications.patch |   24 -
 debian/rules                              |    3 +-
 debian/twinkle.1                          |   18 +-
 src/abstract_dialog.cpp                   |   31 +-
 src/abstract_dialog.h                     |   15 +-
 src/address_book.cpp                      |    2 +-
 src/address_book.h                        |    2 +-
 src/audio/audio_codecs.cpp                |    2 +-
 src/audio/audio_codecs.h                  |    2 +-
 src/audio/audio_decoder.cpp               |    2 +-
 src/audio/audio_decoder.h                 |    2 +-
 src/audio/audio_device.cpp                |    2 +-
 src/audio/audio_device.h                  |    2 +-
 src/audio/audio_encoder.cpp               |    2 +-
 src/audio/audio_encoder.h                 |    2 +-
 src/audio/audio_rx.cpp                    |    7 +-
 src/audio/audio_rx.h                      |    2 +-
 src/audio/audio_session.cpp               |    2 +-
 src/audio/audio_session.h                 |    2 +-
 src/audio/audio_tx.cpp                    |   55 +-
 src/audio/audio_tx.h                      |    2 +-
 src/audio/dtmf_player.cpp                 |    2 +-
 src/audio/dtmf_player.h                   |    2 +-
 src/audio/freq_gen.cpp                    |    2 +-
 src/audio/freq_gen.h                      |    2 +-
 src/audio/media_buffer.cpp                |    2 +-
 src/audio/media_buffer.h                  |    2 +-
 src/audio/rtp_telephone_event.cpp         |    2 +-
 src/audio/rtp_telephone_event.h           |    2 +-
 src/audio/tone_gen.cpp                    |    2 +-
 src/audio/tone_gen.h                      |    2 +-
 src/audio/twinkle_rtp_session.cpp         |    2 +-
 src/audio/twinkle_rtp_session.h           |    2 +-
 src/audio/twinkle_zrtp_ui.cpp             |    2 +-
 src/audio/twinkle_zrtp_ui.h               |    2 +-
 src/audits/memman.cpp                     |    2 +-
 src/audits/memman.h                       |    2 +-
 src/auth.cpp                              |    2 +-
 src/auth.h                                |    2 +-
 src/call_history.cpp                      |    2 +-
 src/call_history.h                        |    2 +-
 src/call_script.cpp                       |    2 +-
 src/call_script.h                         |    2 +-
 src/client_request.cpp                    |    2 +-
 src/client_request.h                      |    2 +-
 src/cmd_socket.cpp                        |    2 +-
 src/cmd_socket.h                          |    2 +-
 src/dialog.cpp                            |    6 +-
 src/dialog.h                              |    2 +-
 src/events.cpp                            |    5 +-
 src/events.h                              |    5 +-
 src/exceptions.h                          |    2 +-
 src/gui/Makefile                          |   68 +-
 src/gui/address_finder.cpp                |    2 +-
 src/gui/address_finder.h                  |    2 +-
 src/gui/addresscardform.ui.h              |    2 +-
 src/gui/addresslistviewitem.cpp           |    2 +-
 src/gui/addresslistviewitem.h             |    2 +-
 src/gui/authenticationform.ui.h           |    2 +-
 src/gui/core_strings.h                    |   17 +-
 src/gui/deregisterform.ui.h               |    2 +-
 src/gui/dtmfform.ui.h                     |    2 +-
 src/gui/getaddressform.ui.h               |    7 +-
 src/gui/getprofilenameform.ui.h           |    2 +-
 src/gui/gui.cpp                           |    9 +-
 src/gui/gui.h                             |    4 +-
 src/gui/historyform.ui.h                  |    2 +-
 src/gui/historylistview.cpp               |    2 +-
 src/gui/historylistview.h                 |    2 +-
 src/gui/inviteform.ui.h                   |    2 +-
 src/gui/lang/twinkle_de.ts                |  995 +++++-----
 src/gui/lang/twinkle_nl.ts                |  790 ++++----
 src/gui/logviewform.ui.h                  |    2 +-
 src/gui/main.cpp                          |   71 +-
 src/gui/mphoneform.ui                     |   37 +-
 src/gui/mphoneform.ui.h                   |   39 +-
 src/gui/numberconversionform.ui.h         |    2 +-
 src/gui/qt_translator.h                   |    2 +-
 src/gui/redirectform.ui.h                 |    2 +-
 src/gui/selectnicform.ui.h                |    2 +-
 src/gui/selectprofileform.ui.h            |    4 +-
 src/gui/selectuserform.ui.h               |    2 +-
 src/gui/srvredirectform.ui.h              |    2 +-
 src/gui/syssettingsform.ui                |    2 +-
 src/gui/syssettingsform.ui.h              |    4 +-
 src/gui/termcapform.ui.h                  |    2 +-
 src/gui/transferform.ui.h                 |    2 +-
 src/gui/twinklesystray.cpp                |    2 +-
 src/gui/twinklesystray.h                  |    2 +-
 src/gui/userprofileform.ui                |    9 +-
 src/gui/userprofileform.ui.h              |    6 +-
 src/gui/wizardform.ui.h                   |   10 +-
 src/gui/yesnodialog.cpp                   |    2 +-
 src/gui/yesnodialog.h                     |    2 +-
 src/id_object.cpp                         |    2 +-
 src/id_object.h                           |    2 +-
 src/line.cpp                              |    2 +-
 src/line.h                                |    4 +-
 src/listener.cpp                          |    4 +-
 src/listener.h                            |    2 +-
 src/log.cpp                               |    2 +-
 src/log.h                                 |    2 +-
 src/main.cpp                              |   59 +-
 src/mwi/mwi.cpp                           |    2 +-
 src/mwi/mwi.h                             |    2 +-
 src/mwi/mwi_dialog.cpp                    |    2 +-
 src/mwi/mwi_dialog.h                      |    2 +-
 src/mwi/mwi_subscription.cpp              |    2 +-
 src/mwi/mwi_subscription.h                |    2 +-
 src/mwi/simple_msg_sum_body.cpp           |    2 +-
 src/mwi/simple_msg_sum_body.h             |    2 +-
 src/parser/challenge.cpp                  |    2 +-
 src/parser/challenge.h                    |    2 +-
 src/parser/coding.cpp                     |    2 +-
 src/parser/coding.h                       |    2 +-
 src/parser/credentials.cpp                |    2 +-
 src/parser/credentials.h                  |    2 +-
 src/parser/definitions.cpp                |    2 +-
 src/parser/definitions.h                  |    2 +-
 src/parser/hdr_accept.cpp                 |    2 +-
 src/parser/hdr_accept.h                   |    2 +-
 src/parser/hdr_accept_encoding.cpp        |    2 +-
 src/parser/hdr_accept_encoding.h          |    2 +-
 src/parser/hdr_accept_language.cpp        |    2 +-
 src/parser/hdr_accept_language.h          |    2 +-
 src/parser/hdr_alert_info.cpp             |    2 +-
 src/parser/hdr_alert_info.h               |    2 +-
 src/parser/hdr_allow.cpp                  |    2 +-
 src/parser/hdr_allow.h                    |    2 +-
 src/parser/hdr_allow_events.cpp           |    2 +-
 src/parser/hdr_allow_events.h             |    2 +-
 src/parser/hdr_auth_info.cpp              |    2 +-
 src/parser/hdr_auth_info.h                |    2 +-
 src/parser/hdr_authorization.cpp          |    2 +-
 src/parser/hdr_authorization.h            |    2 +-
 src/parser/hdr_call_id.cpp                |    2 +-
 src/parser/hdr_call_id.h                  |    2 +-
 src/parser/hdr_call_info.cpp              |    2 +-
 src/parser/hdr_call_info.h                |    2 +-
 src/parser/hdr_contact.cpp                |    2 +-
 src/parser/hdr_contact.h                  |    2 +-
 src/parser/hdr_content_disp.cpp           |    2 +-
 src/parser/hdr_content_disp.h             |    2 +-
 src/parser/hdr_content_encoding.cpp       |    2 +-
 src/parser/hdr_content_encoding.h         |    2 +-
 src/parser/hdr_content_language.cpp       |    2 +-
 src/parser/hdr_content_language.h         |    2 +-
 src/parser/hdr_content_length.cpp         |    2 +-
 src/parser/hdr_content_length.h           |    2 +-
 src/parser/hdr_content_type.cpp           |    2 +-
 src/parser/hdr_content_type.h             |    2 +-
 src/parser/hdr_cseq.cpp                   |    2 +-
 src/parser/hdr_cseq.h                     |    2 +-
 src/parser/hdr_date.cpp                   |    2 +-
 src/parser/hdr_date.h                     |    2 +-
 src/parser/hdr_error_info.cpp             |    2 +-
 src/parser/hdr_error_info.h               |    2 +-
 src/parser/hdr_event.cpp                  |    2 +-
 src/parser/hdr_event.h                    |    2 +-
 src/parser/hdr_expires.cpp                |    2 +-
 src/parser/hdr_expires.h                  |    2 +-
 src/parser/hdr_from.cpp                   |    2 +-
 src/parser/hdr_from.h                     |    2 +-
 src/parser/hdr_in_reply_to.cpp            |    2 +-
 src/parser/hdr_in_reply_to.h              |    2 +-
 src/parser/hdr_max_forwards.cpp           |    2 +-
 src/parser/hdr_max_forwards.h             |    2 +-
 src/parser/hdr_mime_version.cpp           |    2 +-
 src/parser/hdr_mime_version.h             |    2 +-
 src/parser/hdr_min_expires.cpp            |    2 +-
 src/parser/hdr_min_expires.h              |    2 +-
 src/parser/hdr_organization.cpp           |    2 +-
 src/parser/hdr_organization.h             |    2 +-
 src/parser/hdr_p_asserted_identity.cpp    |    2 +-
 src/parser/hdr_p_asserted_identity.h      |    2 +-
 src/parser/hdr_p_preferred_identity.cpp   |    2 +-
 src/parser/hdr_p_preferred_identity.h     |    2 +-
 src/parser/hdr_priority.cpp               |    2 +-
 src/parser/hdr_priority.h                 |    2 +-
 src/parser/hdr_privacy.cpp                |    2 +-
 src/parser/hdr_privacy.h                  |    2 +-
 src/parser/hdr_proxy_authenticate.cpp     |    2 +-
 src/parser/hdr_proxy_authenticate.h       |    2 +-
 src/parser/hdr_proxy_authorization.cpp    |    2 +-
 src/parser/hdr_proxy_authorization.h      |    2 +-
 src/parser/hdr_proxy_require.cpp          |    2 +-
 src/parser/hdr_proxy_require.h            |    2 +-
 src/parser/hdr_rack.cpp                   |    2 +-
 src/parser/hdr_rack.h                     |    2 +-
 src/parser/hdr_record_route.cpp           |    2 +-
 src/parser/hdr_record_route.h             |    2 +-
 src/parser/hdr_refer_sub.cpp              |    2 +-
 src/parser/hdr_refer_sub.h                |    2 +-
 src/parser/hdr_refer_to.cpp               |    2 +-
 src/parser/hdr_refer_to.h                 |    2 +-
 src/parser/hdr_referred_by.cpp            |    2 +-
 src/parser/hdr_referred_by.h              |    2 +-
 src/parser/hdr_replaces.cpp               |    2 +-
 src/parser/hdr_replaces.h                 |    2 +-
 src/parser/hdr_reply_to.cpp               |    2 +-
 src/parser/hdr_reply_to.h                 |    2 +-
 src/parser/hdr_require.cpp                |    2 +-
 src/parser/hdr_require.h                  |    2 +-
 src/parser/hdr_retry_after.cpp            |    2 +-
 src/parser/hdr_retry_after.h              |    2 +-
 src/parser/hdr_route.cpp                  |    2 +-
 src/parser/hdr_route.h                    |    2 +-
 src/parser/hdr_rseq.cpp                   |    2 +-
 src/parser/hdr_rseq.h                     |    2 +-
 src/parser/hdr_server.cpp                 |    2 +-
 src/parser/hdr_server.h                   |    2 +-
 src/parser/hdr_subject.cpp                |    2 +-
 src/parser/hdr_subject.h                  |    2 +-
 src/parser/hdr_subscription_state.cpp     |    2 +-
 src/parser/hdr_subscription_state.h       |    2 +-
 src/parser/hdr_supported.cpp              |    2 +-
 src/parser/hdr_supported.h                |    2 +-
 src/parser/hdr_timestamp.cpp              |    2 +-
 src/parser/hdr_timestamp.h                |    2 +-
 src/parser/hdr_to.cpp                     |    2 +-
 src/parser/hdr_to.h                       |    2 +-
 src/parser/hdr_unsupported.cpp            |    2 +-
 src/parser/hdr_unsupported.h              |    2 +-
 src/parser/hdr_user_agent.cpp             |    2 +-
 src/parser/hdr_user_agent.h               |    2 +-
 src/parser/hdr_via.cpp                    |    2 +-
 src/parser/hdr_via.h                      |    2 +-
 src/parser/hdr_warning.cpp                |    2 +-
 src/parser/hdr_warning.h                  |    2 +-
 src/parser/hdr_www_authenticate.cpp       |    2 +-
 src/parser/hdr_www_authenticate.h         |    2 +-
 src/parser/header.cpp                     |    2 +-
 src/parser/header.h                       |    2 +-
 src/parser/identity.cpp                   |    2 +-
 src/parser/identity.h                     |    2 +-
 src/parser/media_type.cpp                 |    2 +-
 src/parser/media_type.h                   |    2 +-
 src/parser/parameter.cpp                  |    2 +-
 src/parser/parameter.h                    |    2 +-
 src/parser/parse_ctrl.cpp                 |    2 +-
 src/parser/parse_ctrl.h                   |    6 +-
 src/parser/parser.cxx                     | 3005 +++++++++++++++--------------
 src/parser/parser.h                       |  246 +--
 src/parser/parser.yxx                     |   45 +-
 src/parser/request.cpp                    |    2 +-
 src/parser/request.h                      |    2 +-
 src/parser/response.cpp                   |    2 +-
 src/parser/response.h                     |    2 +-
 src/parser/scanner.cxx                    | 1880 +++++++++---------
 src/parser/scanner.lxx                    |   28 +-
 src/parser/sip_body.cpp                   |    2 +-
 src/parser/sip_body.h                     |    2 +-
 src/parser/sip_message.cpp                |    6 +-
 src/parser/sip_message.h                  |    9 +-
 src/phone.cpp                             |   85 +-
 src/phone.h                               |   17 +-
 src/phone_user.cpp                        |  208 +-
 src/phone_user.h                          |   29 +-
 src/prohibit_thread.cpp                   |    2 +-
 src/prohibit_thread.h                     |    2 +-
 src/protocol.h                            |    2 +-
 src/redirect.cpp                          |    2 +-
 src/redirect.h                            |    2 +-
 src/sdp/sdp.cpp                           |    2 +-
 src/sdp/sdp.h                             |    2 +-
 src/sdp/sdp_parse_ctrl.cpp                |    2 +-
 src/sdp/sdp_parse_ctrl.h                  |    2 +-
 src/sdp/sdp_parser.yxx                    |    2 +-
 src/sdp/sdp_scanner.cxx                   |    2 +-
 src/sdp/sdp_scanner.lxx                   |    2 +-
 src/sender.cpp                            |   40 +-
 src/sender.h                              |    2 +-
 src/service.cpp                           |    2 +-
 src/service.h                             |    2 +-
 src/session.cpp                           |    2 +-
 src/session.h                             |    2 +-
 src/sockets/Makefile.am                   |    6 +-
 src/sockets/Makefile.in                   |    6 +-
 src/sockets/dnssrv.h                      |    2 +-
 src/sockets/interfaces.cpp                |    2 +-
 src/sockets/interfaces.h                  |    2 +-
 src/sockets/socket.cpp                    |    2 +-
 src/sockets/socket.h                      |    2 +-
 src/sockets/url.cpp                       |   72 +-
 src/sockets/url.h                         |    2 +-
 src/stun/stun_transaction.cpp             |   67 +-
 src/stun/stun_transaction.h               |    2 +-
 src/sub_refer.cpp                         |    2 +-
 src/sub_refer.h                           |    2 +-
 src/subscription.cpp                      |    2 +-
 src/subscription.h                        |    2 +-
 src/subscription_dialog.cpp               |    6 +-
 src/subscription_dialog.h                 |    2 +-
 src/sys_settings.cpp                      |   13 +-
 src/sys_settings.h                        |    2 +-
 src/threads/mutex.cpp                     |    2 +-
 src/threads/mutex.h                       |    2 +-
 src/threads/sema.cpp                      |    2 +-
 src/threads/sema.h                        |    2 +-
 src/threads/thread.cpp                    |    2 +-
 src/threads/thread.h                      |    2 +-
 src/timekeeper.cpp                        |    2 +-
 src/timekeeper.h                          |    2 +-
 src/transaction.cpp                       |    2 +-
 src/transaction.h                         |    2 +-
 src/transaction_layer.cpp                 |    2 +-
 src/transaction_layer.h                   |    2 +-
 src/transaction_mgr.cpp                   |    2 +-
 src/transaction_mgr.h                     |    2 +-
 src/translator.h                          |    2 +-
 src/user.cpp                              |   12 +-
 src/user.h                                |    2 +-
 src/userintf.cpp                          |   13 +-
 src/userintf.h                            |    3 +-
 src/util.cpp                              |    2 +-
 src/util.h                                |    2 +-
 322 files changed, 4746 insertions(+), 3979 deletions(-)

diff --cc debian/changelog
index d0b8a8b,0000000..f274746
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,250 -1,0 +1,263 @@@
++twinkle (1:1.0-1) unstable; urgency=low
++
++  * New upstream release
++    - binNMU required (Closes: #402509)
++    - Via headers containing ipv6 addresses are dropped (Closes: #398849)
++  * Update debian/rules URL location
++  * Delete debian/patches/extra-qualifications.patch included upstream
++  * Update debian/control package Description
++  * Update debian/twinkle.1 manpage for 1.0 release
++  * lintian cleanup: extended-description-line-too-long
++
++ -- Mark Purcell <msp at debian.org>  Thu, 25 Jan 2007 22:32:22 +0000
++
 +twinkle (1:1.0~beta-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Needed for the preceeding package to get into etch
 +  * delete debian/patches dtmf, invite4xx and memman included upstream
 +  * debian/rules get-orig-source targets rewritten
 +  * Cleanup debian/watch
 +  * Add extra-qualifications.patch to fix upstream g 4.1.1 build errors
 +
 + -- Mark Purcell <msp at debian.org>  Mon,  8 Jan 2007 21:29:49 +0000
 +
 +twinkle (1:0.9-6) testing-proposed-updates; urgency=medium
 +
 +  * Apply upstream memman.patch to fix random twinkle crashes
 +    - crash on call end (Closes: #402509)
 +  * Loaded direct to t-p-u as discussed on debian-release
 +
 + -- Mark Purcell <msp at debian.org>  Sun,  7 Jan 2007 06:27:36 +0000
 +
 +twinkle (1:0.9-5) unstable; urgency=low
 +
 +  * Pre-run autoheader to include expected src/twinkle_config.h.in changes
 +    inside debian/patches/libgsm.patch
 +    - Closes: #394153: FTBFS: undefined reference to gsm_decode
 +
 + -- Mark Purcell <msp at debian.org>  Sat, 25 Nov 2006 08:57:34 +0000
 +
 +twinkle (1:0.9-4) unstable; urgency=low
 +
 +  * Grab upstream patches: DTMF & Invite4xx
 +  * VoIP Provider issue: Can't talk for more than a minute (Closes: #365588)
 +  * help2man generated manpage
 +  * Linitan cleanup: manpage-has-useless-whatis-entry
 +
 + -- Mark Purcell <msp at debian.org>  Sat,  4 Nov 2006 13:17:50 +0000
 +
 +twinkle (1:0.9-3) unstable; urgency=low
 +
 +  * Rebuild
 +
 + -- Mark Purcell <msp at debian.org>  Wed,  1 Nov 2006 21:38:21 +0000
 +
 +twinkle (1:0.9-2) unstable; urgency=low
 +
 +  * Build-Depends: libzrtpcpp-dev
 +
 + -- Mark Purcell <msp at debian.org>  Mon, 16 Oct 2006 19:22:13 +0100
 +
 +twinkle (1:0.9-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Update Build-Depends
 +  * PRACK messages should be authenticated (Closes: #389252)
 +
 + -- Mark Purcell <msp at debian.org>  Mon,  2 Oct 2006 09:50:03 +0800
 +
 +twinkle (1:0.8.1-1) unstable; urgency=low
 +
 +  [ Kilian Krause ]
 +  * New upstream release. Ships without iLBC, therefore no need to repackage.
 +
 +  [ Mark Purcell ]
 +  * Cleanup debian/patches/libgsm.patch
 +  * Use upstream supplied sip.protocol & twinkle.desktop
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 20 Jul 2006 19:33:00 +0100
 +
 +twinkle (0.8.dfsg-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Remove non-free iLBC code from DFSG release
 +
 + -- Mark Purcell <msp at debian.org>  Sun,  2 Jul 2006 21:37:09 +0100
 +
 +twinkle (0.7.1-2) unstable; urgency=low
 +
 +  * Enable sip URIs: debian/sip.protocol
 +    - Twinkle won't manage sip URI from Konqueror (Closes: #366975)
 +
 + -- Mark Purcell <msp at debian.org>  Fri, 12 May 2006 21:20:39 +0100
 +
 +twinkle (0.7.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Mark Purcell <msp at debian.org>  Sun,  7 May 2006 23:00:03 +0100
 +
 +twinkle (0.7-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Update debian/control. Fixes FTBFS on kfreebsd-amd64: unsatisfied
 +     Build-Depends (Closes: #361483)
 +  * Rebuild with updated libccrtp & libcommoncpp2
 +    - Fixes: libccext2-1.3.so.1: cannot open shared object file (Closes: #362440)
 +  * Installed debian/twinkle.desktop. Fixes: please install a .desktop
 +  file (Closes: #358398)
 +  * Add Build-Depends: libspeex-dev
 +  * Modify debian/patches/libgsm.diff
 +
 + -- Mark Purcell <msp at debian.org>  Mon,  1 May 2006 12:21:03 +0100
 +
 +twinkle (0.6.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * debian/patches/gui.cpp.diff removed as applied upstream
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 26 Feb 2006 17:46:56 +0000
 +
 +twinkle (0.6.1-2) unstable; urgency=low
 +
 +  * Add debian/patches/libgsm.diff to use Build-Depends: libgsm1-dev
 +  * Add debian/patches/gui.cpp.diff (Closes: Bug#352534)
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 21 Feb 2006 18:31:51 +0000
 +
 +twinkle (0.6.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 12 Feb 2006 08:06:44 +0000
 +
 +twinkle (0.6-1) UNRELEASED; urgency=low
 +
 +  * (NOT RELEASED YET) New upstream release
 +  * Add Build-Depends: libxpm-dev, libsndfile1-dev
 +
 + -- Mark Purcell <msp at debian.org>  Fri, 10 Feb 2006 10:32:07 +1100
 +
 +twinkle (0.5-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Don't ship upstream NEWS as it is a duplicate of upstream ChangeLog
 +  * Remove usr/sbin from debian/dirs
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 17 Jan 2006 16:53:16 +0000
 +
 +twinkle (0.4.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - Lines hang with "dialing" status (Closes: #340779)
 +    - does not play ringtone (Closes: #340233)
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 29 Nov 2005 20:47:21 +0000
 +
 +twinkle (0.4.1-3) unstable; urgency=low
 +
 +  * Rebuild against kdelibs 3.4.2 for unstable
 +    - twinkle is not installable on sid (Closes: #340534)
 +  * Suggests: kaddressbook
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 24 Nov 2005 07:34:45 +0000
 +
 +twinkle (0.4.1-2) unstable; urgency=low
 +
 +  * Rebuild against kdelibs 3.4.2
 +
 + -- Mark Purcell <msp at debian.org>  Tue, 22 Nov 2005 20:16:05 +0000
 +
 +twinkle (0.4.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - FTBFS on 64 bit arches: cast from 'void*' to 'int' loses precision
 +    (Closes: #324395)
 +    - ftbfs [sparc] stun.cxx:680: error: 'gethrtime' was not declared in
 +    this scope (Closes: #336746)
 +  * Fix Build-Depends: FTBFS on GNU/kFreeBSD (Closes: #336859)
 +  * Copyright audit to debian/copyright
 +  * Use correct QTDIR=/usr/share/qt3, negates need for
 +    DEB_AUTO_UPDATE_AUTOCONF
 +  * Remove patch against configure.in
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 20 Nov 2005 23:05:07 +0000
 +
 +twinkle (0.3.2-4) unstable; urgency=low
 +
 +  * Add Build-Depends: kdelibs4-dev kdelibs-bin, libasounds2-dev, libxml2-dev
 +    - fix ppc build (Closes: #325057)
 +  * Remove ppc-build patch, obsolete by upstream v 0.3
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 30 Oct 2005 07:56:45 +0000
 +
 +twinkle (0.3.2-3) unstable; urgency=low
 +
 +  * Use DEB_AUTO_UPDATE_AUTOCONF to rebuild configure from patched
 +    configure.in. Ugly..
 +
 + -- Mark Purcell <msp at debian.org>  Sat, 29 Oct 2005 22:54:12 +0100
 +
 +twinkle (0.3.2-2) unstable; urgency=low
 +
 +  * Add Build-Depends: cdbs
 +
 + -- Mark Purcell <msp at debian.org>  Sat, 29 Oct 2005 17:45:43 +0100
 +
 +twinkle (0.3.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - New upstream version available (Closes: #334615)
 +  * FTBFS on 64 bit arches: cast from 'void*' to 'int' loses precision
 +    (Closes: #324395)
 +  * Patch from Guido Guenther
 +    - fix ppc build (Closes: #325057)
 +  * Patch from Mikael Magnusson
 +    - Thread creation timing bug causes crashes (Closes: #329433)
 +  * Fix: old-fsf-address-in-copyright-file
 +
 + -- Mark Purcell <msp at debian.org>  Sat, 29 Oct 2005 16:46:40 +0100
 +
 +twinkle (0.3-1) unstable; urgency=low
 +
 +  [ Kilian Krause ]
 +  * Debian VoIP upload
 +
 +  [ Mark Purcell ]
 +  * New upstream release
 +  * Switch to cdbs!
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 13 Oct 2005 18:12:02 +0100
 +
 +twinkle (0.2.1-2) unstable; urgency=low
 +
 +  * Build-Depends: libxml2-dev
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 21 Aug 2005 15:55:13 +0100
 +
 +twinkle (0.2.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Build-Depends:  libccrtp-dev (>=1.3.4)
 +  * Add Build-Depends: qt3-apps-dev
 +  * Add Build-Depends: automake1.9
 +  * Export QTDIR for build target as well :-(
 +  * Update extended description
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 21 Aug 2005 14:05:30 +0100
 +
 +twinkle (0.1-2) unstable; urgency=low
 +
 +  * C++ migration
 +  * Build-Depends:  libqt3-mt-dev (>= 3:3.3.4-4)
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 18 Aug 2005 21:02:31 +0100
 +
 +twinkle (0.1-1) experimental; urgency=low
 +
 +  * Upload to experimental while c++ transition
 +  * Initial release Closes: #311150
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 11 Aug 2005 22:16:20 +0100
 +
diff --cc debian/control
index c768d73,0000000..96e9674
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,43 -1,0 +1,79 @@@
 +Source: twinkle
 +Section: comm
 +Priority: optional
 +Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 +Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
 +Build-Depends: debhelper (>= 4.0.0), autotools-dev, libcommoncpp2-dev (>= 1.4.2), libccrtp-dev (>= 1.5.0), help2man, libqt3-mt-dev (>= 3:3.3.0), qt3-apps-dev, automake1.9, cdbs, kdelibs-bin, kdelibs4-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml2-dev, libgsm1-dev, libsndfile1-dev, libxpm-dev, libspeex-dev, libboost-regex-dev, libzrtpcpp-dev
 +Standards-Version: 3.6.1
++XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
++XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
 +
 +Package: twinkle
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Suggests: kaddressbook
 +Description: Voice over Internet Protocol (VoIP) SIP Phone
-  Softphone for making telephone calls using SIP over an IP network.
++ Soft-phone for making telephone calls using SIP over an IP network.
 + .
 + Twinkle supports direct IP phone to IP phone communication or a network
 + using a SIP proxy to route your calls.
 + .
 + In addition to making basic voice calls Twinkle provides you the
 + following features regardless of the services that your VoIP service
 + provider might offer. 
 + .
 +  2 call appearances (lines)
++  Multiple active call identities
++  Custom ring tones
 +  Call Waiting
 +  Call Hold
 +  3-way conference calling
 +  Mute
 +  Call redirection on demand
 +  Call redirection unconditional
 +  Call redirection when busy
 +  Call redirection no answer
 +  Reject call redirection request
 +  Blind call transfer
++  Call transfer with consultation (attended call transfer) (new)
 +  Reject call transfer request
 +  Call reject
++  Repeat last call
 +  Do not disturb
-   Auto answer 
-   Send DTMF digits (RFC 2833) to navigate IVR systems
++  Auto answer
++  Message Waiting Indication (new)
++  Voice mail speed dial (new)
++  User definable scripts triggered on call events
++   E.g. to implement selective call reject or distinctive ringing 
++  RFC 2833 DTMF events
++  In-band DTMF
++  Out-of-band DTMF (SIP INFO)
 +  STUN support for NAT traversal
 +  Send NAT keep alive packets when using STUN
 +  NAT traversal through static provisioning
++  Missed call indication
++  History of call detail records for incoming, outgoing, successful and missed
++  DNS SRV support
++  Automatic fail-over to an alternate server if a server is unavailable
++  Other programs can originate a call via Twinkle, e.g. call from address book
++  System tray icon
++  System tray menu to originate and answer calls while Twinkle stays hidden
++  User definable number conversion rules
++  Simple address book (new)
++ .
++ Audio codecs
++  G.711 A-law (64 kbps payload, 8 kHz sampling rate)
++  G.711 u-law (64 kbps payload, 8 kHz sampling rate)
++  GSM (13 kbps payload, 8 kHz sampling rate)
++  Speex narrow band (15.2 kbps payload, 8 kHz sampling rate)
++  Speex wide band (28 kbps payload, 16 kHz sampling rate)
++  Speex ultra wide band (36 kbps payload, 32 kHz sampling rate)
++  G.726 (16, 24, 32 or 40 kbps payload, 8 kHz sampling rate)
++ .
++ KDE goodies
++  Balloon pop-up from system tray when a call comes in
++  Interface to KAddressBook: dial phone numbers from your address book
++  Display names from KAddressBook on incoming calls
++  Display photos from KAddressBook on incoming calls
 + .
 + Website: http://www.twinklephone.com
diff --cc debian/rules
index 48040af,0000000..778ff1d
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,43 -1,0 +1,42 @@@
 +#!/usr/bin/make -f
 +# Sample debian/rules that uses cdbs.  Originaly written by Robert Millan.
 +# This file is public domain.
 +  
 +# Add here any variable or target overrides you need
 +
 +export QTDIR=/usr/share/qt3
 +
 +UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.bz2
- URL2 = http://www.xs4all.nl/~mfnboer/twinkle/download/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
++URL = http://www.xs4all.nl/~mfnboer/twinkle/download/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
 +
 +FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
- URL := http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-1.0beta.tar.gz
 +
 +-include /usr/share/cdbs/1/class/autotools.mk
 +-include /usr/share/cdbs/1/rules/debhelper.mk
 +-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 +
 +DEB_CONFIGURE_EXTRA_FLAGS := --without-ilbc
 +
 +DEB_INSTALL_MANPAGES_twinkle = debian/twinkle.1
 +
 +install/twinkle::
 +	cp twinkle.desktop $(CURDIR)/debian/twinkle/usr/share/applications
 +	cp sip.protocol $(CURDIR)/debian/twinkle/usr/share/services
 +
 +print-version:
 +	@@echo DEB_SOURCE_PACKAGE: $(DEB_SOURCE_PACKAGE)
 +	@@echo DEB_VERSION: $(DEB_VERSION)
 +	@@echo DEB_NO_EPOCH_VERSION: $(DEB_NOEPOCH_VERSION)
 +	@@echo DEB_UPSTREAM_VERSION: $(DEB_UPSTREAM_VERSION)
 +	@@echo FILENAME: $(FILENAME)
 +	@@echo URL: $(URL)
 +	@@echo URL2: $(URL2)
 +
 +get-orig-source:
 +	@@dh_testdir
 +	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
 +	@@echo Downloading $(FILENAME) from $(URL) ...
 +	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
 +
 +help2man:
 +	help2man twinkle -N -n 'Voice over Internet Protocol (VoIP) SIP Phone' -o debian/twinkle.1
diff --cc debian/twinkle.1
index 530433a,0000000..f03ff55
mode 100644,000000..100644
--- a/debian/twinkle.1
+++ b/debian/twinkle.1
@@@ -1,102 -1,0 +1,116 @@@
 +.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
- .TH TWINKLE "1" "November 2006" "Twinkle 0.9 - October 1 2006" "User Commands"
++.TH TWINKLE "1" "January 2007" "Twinkle 1.0 - 22 January 2007" "User Commands"
 +.SH NAME
 +Twinkle \- Voice over Internet Protocol (VoIP) SIP Phone
 +.SH SYNOPSIS
 +.B twinkle
 +[\fIoptions\fR]
 +.SH OPTIONS
 +.TP
 +\fB\-c\fR
 +Run in command line interface (CLI) mode
 +.TP
 +\fB\-\-share\fR <dir>
 +Set the share directory.
 +.TP
 +\fB\-f\fR <profile>
 +Startup with a specific profile. You will not be requested
 +to choose a profile at startup. The profiles that you created
 +are the .cfg files in your .twinkle directory.
 +You may specify multiple profiles separated by spaces.
 +.TP
++\fB\-\-force\fR
++If a lock file is detected at startup, then override it
++and startup.
++.TP
 +\fB\-i\fR <IP addr>
 +If you have multiple IP addresses on your computer,
 +then you can supply the IP address to use here.
++.HP
++\fB\-\-sip\-port\fR <port>
++.IP
++Port for SIP UDP signalling.
++This port overrides the port from the system settings.
++.HP
++\fB\-\-rtp\-port\fR <port>
++.IP
++Port for RTP.
++This port overrides the port from the system settings.
 +.TP
 +\fB\-\-nic\fR <NIC>
 +If you have multiple NICs on your computer,
 +then you can supply the NIC name to use here (e.g. eth0).
 +.HP
 +\fB\-\-call\fR <address>
 +.IP
 +Instruct Twinkle to call the address.
 +When Twinkle is already running, this will instruct the running
 +process to call the address.
 +The address may be a full or partial SIP URI. A partial SIP URI
 +will be completed with the information from the user profile.
 +.IP
 +A subject may be passed by appending '?subject=<subject>'
 +to the address.
 +.IP
 +Examples:
 +twinkle \fB\-\-call\fR 123456
 +twinkle \fB\-\-call\fR sip:example at example.com?subject=hello
 +.HP
 +\fB\-\-cmd\fR <cli command>
 +.IP
 +Instruct Twinkle to execute the CLI command. You can run
 +all commands from the command line interface mode.
 +When Twinkle is already running, this will instruct the running
 +process to execute the CLI command.
 +.IP
 +Examples:
 +twinkle \fB\-\-cmd\fR answer
 +twinkle \fB\-\-cmd\fR mute
 +twinkle \fB\-\-cmd\fR 'transfer 12345'
 +.HP
 +\fB\-\-immediate\fR
 +.IP
 +This option can be used in conjunction with \fB\-\-call\fR or \fB\-\-cmd\fR
 +It indicates the the command or call is to be performed
 +immediately without asking the user for any confirmation.
 +.HP
 +\fB\-\-set\-profile\fR <profile>
 +.IP
 +Make <profile> the active profile.
 +When using this option in conjuction with \fB\-\-call\fR and \fB\-\-cmd\fR,
 +then the profile is activated before executing \fB\-\-call\fR or
 +\fB\-\-cmd\fR.
 +.HP
 +\fB\-\-help\-cli\fR [cli command]
 +.IP
 +Without a cli command this option lists all available CLI
 +commands. With a CLI command this option prints help on
 +the CLI command.
 +.TP
 +\fB\-\-version\fR
 +Get version information.
 +.SH COPYRIGHT
- Copyright \(co 2005-2006  Michel de Boer
++Copyright \(co 2005-2007  Michel de Boer
 +http://www.twinklephone.com
 +.PP
 +Built with support for: ALSA, KDE, Speex, ZRTP
 +.PP
 +Contributions:
 +* ALSA \- Rickard Petzall
 +* ZRTP/SRTP \- Werner Dittmann
 +.PP
 +This software contains the following software from 3rd parties:
 +* GSM codec from Jutta Degener and Carsten Bormann, University of Berlin
 +* G.711/G.726 codecs from Sun Microsystems (public domain)
 +* Parts of the STUN project at http://sourceforge.net/projects/stun
 +* Parts of libsrv at http://libsrv.sourceforge.net/
 +.PP
 +For RTP the following dynamic libraries are linked:
 +* GNU ccRTP \- http://www.gnu.org/software/ccrtp
 +* GNU CommonC++ \- http://www.gnu.org/software/commoncpp
 +.PP
 +Twinkle comes with ABSOLUTELY NO WARRANTY.
 +This program is free software; you can redistribute it and/or modify
 +it under the terms of the GNU General Public License as published by
 +the Free Software Foundation; either version 2 of the License, or
 +(at your option) any later version.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/twinkle.git



More information about the Pkg-voip-commits mailing list