[Pkg-voip-commits] [twinkle] 27/73: Imported Debian patch 1:1.0~beta-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 2bfcba42b13162446fefe279db5ef3d2b45f34f4
Merge: 76e1fb8 c77bfad
Author: Mark Purcell <msp at debian.org>
Date: Mon Jan 8 21:29:49 2007 +0000
Imported Debian patch 1:1.0~beta-1
ChangeLog | 76 +
Makefile.am | 3 +
Makefile.in | 11 +-
NEWS | 76 +
configure | 151 +-
configure.in | 26 +-
debian/changelog | 11 +
debian/patches/dtmf.patch | 40 -
debian/patches/extra-qualifications.patch | 24 +
debian/patches/invite4xx.patch | 16 -
debian/patches/libgsm.patch | 55 +-
debian/patches/memman.patch | 61 -
debian/rules | 21 +-
debian/watch | 19 +-
src/Makefile.am | 18 +-
src/Makefile.in | 43 +-
src/abstract_dialog.cpp | 307 ++
src/abstract_dialog.h | 165 +
src/address_book.cpp | 288 ++
src/address_book.h | 102 +
src/audio/audio_codecs.h | 1 +
src/audio/audio_decoder.cpp | 34 +-
src/audio/audio_decoder.h | 1 +
src/audio/audio_device.cpp | 58 +-
src/audio/audio_device.h | 4 +
src/audio/audio_encoder.cpp | 52 +-
src/audio/audio_encoder.h | 1 +
src/audio/audio_session.cpp | 2 +
src/audio/tone_gen.cpp | 1 +
src/audits/memman.cpp | 30 +-
src/call_history.cpp | 54 +-
src/call_history.h | 2 +
src/call_script.cpp | 37 +-
src/call_script.h | 1 +
src/client_request.cpp | 124 +
src/client_request.h | 81 +
src/dialog.cpp | 666 +--
src/dialog.h | 174 +-
src/events.cpp | 50 +
src/events.h | 39 +
src/gui/Makefile | 149 +-
src/gui/address_finder.cpp | 2 -
...{numberconversionform.ui => addresscardform.ui} | 132 +-
...berconversionform.ui.h => addresscardform.ui.h} | 49 +-
.../addresslistviewitem.cpp} | 52 +-
.../hdr_call_id.h => gui/addresslistviewitem.h} | 28 +-
src/gui/authenticationform.ui | 3 +
src/gui/core_strings.h | 86 +
src/gui/freedesksystray.cpp | 4 +-
src/gui/getaddressform.ui | 425 +-
src/gui/getaddressform.ui.h | 136 +-
src/gui/getprofilenameform.ui.h | 10 +-
src/gui/gui.cpp | 638 +--
src/gui/gui.h | 42 +-
src/gui/historyform.ui | 7 +-
src/gui/historyform.ui.h | 87 +-
src/gui/historylistview.cpp | 43 +-
src/gui/historylistview.h | 8 +-
src/gui/images/consult-xfer.png | Bin 0 -> 817 bytes
src/gui/images/mwi_failure16.png | Bin 0 -> 898 bytes
src/gui/images/mwi_new16.png | Bin 0 -> 823 bytes
src/gui/images/mwi_none.png | Bin 0 -> 2112 bytes
src/gui/images/mwi_none16.png | Bin 0 -> 790 bytes
src/gui/images/mwi_none16_dis.png | Bin 0 -> 793 bytes
src/gui/images/sys_mwi.png | Bin 0 -> 1422 bytes
src/gui/images/sys_mwi_dis.png | Bin 0 -> 1431 bytes
src/gui/inviteform.ui | 73 +-
src/gui/inviteform.ui.h | 26 +-
src/gui/lang/Makefile.am | 12 +
src/gui/lang/Makefile.in | 463 ++
src/gui/lang/twinkle_de.ts | 5108 ++++++++++++++++++++
src/gui/lang/twinkle_nl.ts | 5082 +++++++++++++++++++
src/gui/logviewform.ui | 2 +-
src/gui/main.cpp | 282 +-
src/gui/mphoneform.ui | 523 +-
src/gui/mphoneform.ui.h | 599 ++-
src/gui/numberconversionform.ui | 5 +-
src/gui/numberconversionform.ui.h | 14 +-
.../hdr_user_agent.h => gui/qt_translator.h} | 37 +-
src/gui/redirectform.ui.h | 6 -
src/gui/selectnicform.ui.h | 4 +-
src/gui/selectprofileform.ui.h | 33 +-
src/gui/selectuserform.ui | 1 +
src/gui/selectuserform.ui.h | 20 +-
src/gui/srvredirectform.ui.h | 16 +-
src/gui/syssettingsform.ui | 156 +-
src/gui/syssettingsform.ui.h | 98 +-
src/gui/termcapform.ui.h | 4 -
src/gui/transferform.ui | 89 +-
src/gui/transferform.ui.h | 105 +-
src/gui/twinkle.pro | 30 +-
src/gui/userprofileform.ui | 835 +++-
src/gui/userprofileform.ui.h | 283 +-
src/gui/wizardform.ui.h | 26 +-
src/gui/yesnodialog.cpp | 86 +
src/{parser/hdr_alert_info.h => gui/yesnodialog.h} | 59 +-
src/{parser/hdr_allow_events.h => id_object.cpp} | 48 +-
src/{parser/hdr_user_agent.h => id_object.h} | 43 +-
src/line.cpp | 382 +-
src/line.h | 128 +-
src/listener.cpp | 30 +-
src/log.cpp | 7 +-
src/main.cpp | 53 +-
src/mwi/Makefile.am | 25 +
src/{ => mwi}/Makefile.in | 394 +-
src/{parser/hdr_mime_version.cpp => mwi/mwi.cpp} | 63 +-
src/{parser/hdr_alert_info.h => mwi/mwi.h} | 56 +-
src/{gui/gui_util.cpp => mwi/mwi_dialog.cpp} | 18 +-
src/{gui/gui_util.h => mwi/mwi_dialog.h} | 18 +-
src/mwi/mwi_subscription.cpp | 89 +
.../hdr_user_agent.h => mwi/mwi_subscription.h} | 35 +-
src/mwi/simple_msg_sum_body.cpp | 168 +
src/mwi/simple_msg_sum_body.h | 90 +
src/parser/Makefile.am | 22 +-
src/parser/Makefile.in | 40 +-
src/parser/challenge.cpp | 8 +-
src/parser/definitions.h | 1 +
src/parser/hdr_accept.cpp | 25 +-
src/parser/hdr_accept.h | 2 -
src/parser/hdr_accept_encoding.cpp | 25 +-
src/parser/hdr_accept_encoding.h | 2 -
src/parser/hdr_accept_language.cpp | 25 +-
src/parser/hdr_accept_language.h | 2 -
src/parser/hdr_alert_info.cpp | 23 +-
src/parser/hdr_alert_info.h | 2 -
src/parser/hdr_allow.cpp | 27 +-
src/parser/hdr_allow.h | 2 -
src/parser/hdr_allow_events.cpp | 30 +-
src/parser/hdr_allow_events.h | 2 -
src/parser/hdr_auth_info.cpp | 23 +-
src/parser/hdr_auth_info.h | 2 -
src/parser/hdr_authorization.cpp | 14 +-
src/parser/hdr_authorization.h | 1 -
src/parser/hdr_call_id.cpp | 30 +-
src/parser/hdr_call_id.h | 4 +-
src/parser/hdr_call_info.cpp | 23 +-
src/parser/hdr_call_info.h | 2 -
src/parser/hdr_contact.cpp | 27 +-
src/parser/hdr_contact.h | 2 -
src/parser/hdr_content_disp.cpp | 23 +-
src/parser/hdr_content_disp.h | 2 -
src/parser/hdr_content_encoding.cpp | 28 +-
src/parser/hdr_content_encoding.h | 2 -
src/parser/hdr_content_language.cpp | 23 +-
src/parser/hdr_content_language.h | 2 -
src/parser/hdr_content_length.cpp | 30 +-
src/parser/hdr_content_length.h | 2 -
src/parser/hdr_content_type.cpp | 27 +-
src/parser/hdr_content_type.h | 2 -
src/parser/hdr_cseq.cpp | 23 +-
src/parser/hdr_cseq.h | 2 -
src/parser/hdr_date.cpp | 23 +-
src/parser/hdr_date.h | 2 -
src/parser/hdr_error_info.cpp | 23 +-
src/parser/hdr_error_info.h | 2 -
src/parser/hdr_event.cpp | 28 +-
src/parser/hdr_event.h | 5 +-
src/parser/hdr_expires.cpp | 23 +-
src/parser/hdr_expires.h | 2 -
src/parser/hdr_from.cpp | 28 +-
src/parser/hdr_from.h | 2 -
src/parser/hdr_in_reply_to.cpp | 23 +-
src/parser/hdr_in_reply_to.h | 2 -
src/parser/hdr_max_forwards.cpp | 23 +-
src/parser/hdr_max_forwards.h | 2 -
src/parser/hdr_mime_version.cpp | 24 +-
src/parser/hdr_mime_version.h | 2 -
src/parser/hdr_min_expires.cpp | 24 +-
src/parser/hdr_min_expires.h | 2 -
src/parser/hdr_organization.cpp | 23 +-
src/parser/hdr_organization.h | 2 -
...dr_priority.cpp => hdr_p_asserted_identity.cpp} | 39 +-
...dr_max_forwards.h => hdr_p_asserted_identity.h} | 20 +-
...r_priority.cpp => hdr_p_preferred_identity.cpp} | 39 +-
...r_max_forwards.h => hdr_p_preferred_identity.h} | 20 +-
src/parser/hdr_priority.cpp | 23 +-
src/parser/hdr_priority.h | 2 -
src/parser/{hdr_subject.cpp => hdr_privacy.cpp} | 44 +-
src/parser/{hdr_supported.h => hdr_privacy.h} | 34 +-
src/parser/hdr_proxy_authenticate.cpp | 22 +-
src/parser/hdr_proxy_authenticate.h | 2 -
src/parser/hdr_proxy_authorization.cpp | 14 +-
src/parser/hdr_proxy_authorization.h | 1 -
src/parser/hdr_proxy_require.cpp | 23 +-
src/parser/hdr_proxy_require.h | 2 -
src/parser/hdr_rack.cpp | 23 +-
src/parser/hdr_rack.h | 2 -
src/parser/hdr_record_route.cpp | 32 +-
src/parser/hdr_record_route.h | 2 -
.../{hdr_organization.cpp => hdr_refer_sub.cpp} | 39 +-
src/parser/{hdr_allow_events.h => hdr_refer_sub.h} | 25 +-
src/parser/hdr_refer_to.cpp | 28 +-
src/parser/hdr_refer_to.h | 2 -
src/parser/hdr_referred_by.cpp | 28 +-
src/parser/hdr_referred_by.h | 2 -
src/parser/{hdr_reply_to.cpp => hdr_replaces.cpp} | 74 +-
src/parser/{hdr_content_disp.h => hdr_replaces.h} | 29 +-
src/parser/hdr_reply_to.cpp | 23 +-
src/parser/hdr_reply_to.h | 2 -
src/parser/hdr_require.cpp | 37 +-
src/parser/hdr_require.h | 3 +-
src/parser/hdr_retry_after.cpp | 23 +-
src/parser/hdr_retry_after.h | 2 -
src/parser/hdr_route.cpp | 31 +-
src/parser/hdr_route.h | 2 -
src/parser/hdr_rseq.cpp | 22 +-
src/parser/hdr_rseq.h | 2 -
src/parser/hdr_server.cpp | 23 +-
src/parser/hdr_server.h | 4 -
src/parser/hdr_subject.cpp | 29 +-
src/parser/hdr_subject.h | 2 -
src/parser/hdr_subscription_state.cpp | 23 +-
src/parser/hdr_subscription_state.h | 2 -
src/parser/hdr_supported.cpp | 44 +-
src/parser/hdr_supported.h | 5 +-
src/parser/hdr_timestamp.cpp | 23 +-
src/parser/hdr_timestamp.h | 2 -
src/parser/hdr_to.cpp | 28 +-
src/parser/hdr_to.h | 2 -
src/parser/hdr_unsupported.cpp | 25 +-
src/parser/hdr_unsupported.h | 2 -
src/parser/hdr_user_agent.cpp | 23 +-
src/parser/hdr_user_agent.h | 2 -
src/parser/hdr_via.cpp | 41 +-
src/parser/hdr_via.h | 2 -
src/parser/hdr_warning.cpp | 23 +-
src/parser/hdr_warning.h | 2 -
src/parser/hdr_www_authenticate.cpp | 22 +-
src/parser/hdr_www_authenticate.h | 2 -
src/parser/header.cpp | 38 +-
src/parser/header.h | 14 +-
src/parser/{hdr_rseq.h => identity.cpp} | 43 +-
src/parser/{hdr_call_id.h => identity.h} | 24 +-
src/parser/parameter.cpp | 8 +-
src/parser/parse_ctrl.cpp | 5 +-
src/parser/parser.cxx | 2947 +++++------
src/parser/parser.h | 126 +-
src/parser/parser.yxx | 96 +-
src/parser/request.cpp | 41 +-
src/parser/scanner.cxx | 1767 +++----
src/parser/scanner.lxx | 5 +
src/parser/sip_body.cpp | 10 +-
src/parser/sip_body.h | 3 +-
src/parser/sip_message.cpp | 19 +
src/parser/sip_message.h | 10 +
src/phone.cpp | 1532 ++++--
src/phone.h | 139 +-
src/phone_user.cpp | 278 +-
src/phone_user.h | 48 +-
src/protocol.h | 34 +-
src/sdp/sdp.cpp | 11 +-
src/sender.cpp | 24 +-
src/service.cpp | 6 +-
src/session.cpp | 48 +-
src/session.h | 8 +
src/sockets/url.cpp | 138 +-
src/sockets/url.h | 29 +-
src/sub_refer.cpp | 39 +-
src/sub_refer.h | 5 +-
src/subscription.cpp | 318 +-
src/subscription.h | 58 +-
src/subscription_dialog.cpp | 396 ++
src/subscription_dialog.h | 112 +
src/sys_settings.cpp | 266 +-
src/sys_settings.h | 32 +-
src/threads/mutex.cpp | 1 +
src/timekeeper.cpp | 64 +-
src/timekeeper.h | 35 +-
src/transaction_layer.cpp | 30 +-
src/transaction_layer.h | 12 +
src/transaction_mgr.cpp | 17 +-
src/transaction_mgr.h | 6 +-
src/{parser/hdr_server.h => translator.h} | 47 +-
src/twinkle_config.h.in | 3 -
src/user.cpp | 391 +-
src/user.h | 97 +-
src/userintf.cpp | 324 +-
src/userintf.h | 35 +-
src/util.cpp | 124 +-
src/util.h | 35 +-
280 files changed, 24729 insertions(+), 7565 deletions(-)
diff --cc debian/changelog
index e89b7f2,0000000..d0b8a8b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,239 -1,0 +1,250 @@@
++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/patches/extra-qualifications.patch
index 0000000,0000000..7ecbbd1
new file mode 100644
--- /dev/null
+++ b/debian/patches/extra-qualifications.patch
@@@ -1,0 -1,0 +1,24 @@@
++diff -Nur twinkle-1.0~beta/src/gui/gui.h twinkle-1.0~beta.new/src/gui/gui.h
++--- twinkle-1.0~beta/src/gui/gui.h 2006-12-28 16:22:32.000000000 +0000
+++++ twinkle-1.0~beta.new/src/gui/gui.h 2007-01-08 20:44:44.000000000 +0000
++@@ -214,7 +214,7 @@
++ void cb_retrieve_referrer(t_user *user_config, int line);
++
++ // A consulation call for a call transfer is being setup.
++- void t_gui::cb_consultation_call_setup(t_user *user_config, int line);
+++ void cb_consultation_call_setup(t_user *user_config, int line);
++
++ // STUN errors
++ void cb_stun_failed(t_user *user_config, int err_code, const string &err_reason);
++diff -Nur twinkle-1.0~beta/src/line.h twinkle-1.0~beta.new/src/line.h
++--- twinkle-1.0~beta/src/line.h 2006-12-27 09:33:52.000000000 +0000
+++++ twinkle-1.0~beta.new/src/line.h 2007-01-08 20:44:30.000000000 +0000
++@@ -254,7 +254,7 @@
++ // permission. This response is received on the dialog that received
++ // the REFER before.
++ // The request (r) is the REFER request that was received.
++- void t_line::recvd_refer_permission(bool permission, t_request *r);
+++ void recvd_refer_permission(bool permission, t_request *r);
++
++ void recvd_stun_resp(StunMessage *r, t_tuid tuid, t_tid tid);
++
diff --cc debian/patches/libgsm.patch
index 207fb42,0000000..4ed0a41
mode 100644,000000..100644
--- a/debian/patches/libgsm.patch
+++ b/debian/patches/libgsm.patch
@@@ -1,127 -1,0 +1,128 @@@
- diff -Nur twinkle-0.9/configure.in twinkle-0.9.new/configure.in
- --- twinkle-0.9/configure.in 2006-11-25 08:39:02.000000000 +0000
- +++ twinkle-0.9.new/configure.in 2006-11-25 08:39:03.000000000 +0000
- @@ -140,6 +140,17 @@
++diff -Nur twinkle-1.0~beta/configure.in twinkle-1.0~beta.new/configure.in
++--- twinkle-1.0~beta/configure.in 2006-12-29 20:16:14.000000000 +0000
+++++ twinkle-1.0~beta.new/configure.in 2007-01-08 21:07:33.000000000 +0000
++@@ -149,6 +149,17 @@
+ AC_CHECK_LIB(sndfile, sf_open, [],
+ [AC_MSG_ERROR([libsndfile library is missing.])])
+
++# Check if libgsm is available
++AC_CHECK_LIB(gsm, sf_open, [
++ AC_CHECK_HEADER(gsm.h, [],
++ [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
++ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
++ LIBS="-lgsm $LIBS"
++ echo "LIBS += -lgsm" >> $QT_INCL_PRO
++ have_gsm="yes" ], [
++ have_gsm="no"
++ echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
++
+ # Check if ALSA is available
+ AC_CHECK_LIB(asound, main, [
+ AC_CHECK_HEADER(alsa/asoundlib.h, [],
- @@ -228,3 +239,4 @@
++@@ -244,3 +255,4 @@
+ AC_MSG_RESULT([Speex: $have_speex])
+ AC_MSG_RESULT([iLBC: $have_ilbc])
+ AC_MSG_RESULT([ZRTP: $have_zrtp])
++AC_MSG_RESULT([Libgsm dynamic link: $have_gsm])
- diff -Nur twinkle-0.9/src/Makefile.am twinkle-0.9.new/src/Makefile.am
- --- twinkle-0.9/src/Makefile.am 2006-11-25 08:39:02.000000000 +0000
- +++ twinkle-0.9.new/src/Makefile.am 2006-11-25 08:39:03.000000000 +0000
- @@ -16,10 +16,10 @@
++diff -Nur twinkle-1.0~beta/src/Makefile.am twinkle-1.0~beta.new/src/Makefile.am
++--- twinkle-1.0~beta/src/Makefile.am 2006-12-29 04:24:06.000000000 +0000
+++++ twinkle-1.0~beta.new/src/Makefile.am 2007-01-08 21:07:46.000000000 +0000
++@@ -16,11 +16,11 @@
+ $(top_builddir)/src/sockets/libsocket.a\
+ $(top_builddir)/src/threads/libthread.a\
+ $(top_builddir)/src/audio/libaudio.a\
+- $(top_builddir)/src/audio/gsm/libgsm.a\
+ $(top_builddir)/src/audits/libaudits.a\
+ $(top_builddir)/src/stun/libstun.a\
++ $(top_builddir)/src/mwi/libmwi.a\
+ $(CCRTP_LIBS)\
++ $(LIBS)\
- -lresolv\
- -lsndfile\
- -lboost_regex
- diff -Nur twinkle-0.9/src/audio/audio_decoder.h twinkle-0.9.new/src/audio/audio_decoder.h
- --- twinkle-0.9/src/audio/audio_decoder.h 2006-11-25 08:39:02.000000000 +0000
- +++ twinkle-0.9.new/src/audio/audio_decoder.h 2006-11-25 08:39:03.000000000 +0000
++ -lsndfile
++
++ libtwinkle_a_SOURCES =\
++diff -Nur twinkle-1.0~beta/src/audio/audio_decoder.h twinkle-1.0~beta.new/src/audio/audio_decoder.h
++--- twinkle-1.0~beta/src/audio/audio_decoder.h 2006-12-28 20:56:49.000000000 +0000
+++++ twinkle-1.0~beta.new/src/audio/audio_decoder.h 2007-01-08 21:07:33.000000000 +0000
+@@ -25,7 +25,12 @@
+ #include "twinkle_config.h"
+ #include "audio_codecs.h"
+ #include "user.h"
++
++#ifdef HAVE_GSM
++#include <gsm/gsm.h>
++#else
+ #include "gsm/inc/gsm.h"
++#endif
+
+ #ifdef HAVE_SPEEX
+ #include <speex/speex.h>
- diff -Nur twinkle-0.9/src/audio/audio_encoder.h twinkle-0.9.new/src/audio/audio_encoder.h
- --- twinkle-0.9/src/audio/audio_encoder.h 2006-11-25 08:39:02.000000000 +0000
- +++ twinkle-0.9.new/src/audio/audio_encoder.h 2006-11-25 08:39:03.000000000 +0000
++diff -Nur twinkle-1.0~beta/src/audio/audio_encoder.h twinkle-1.0~beta.new/src/audio/audio_encoder.h
++--- twinkle-1.0~beta/src/audio/audio_encoder.h 2006-12-28 20:56:17.000000000 +0000
+++++ twinkle-1.0~beta.new/src/audio/audio_encoder.h 2007-01-08 21:07:33.000000000 +0000
+@@ -25,7 +25,12 @@
+ #include "twinkle_config.h"
+ #include "audio_codecs.h"
+ #include "user.h"
++
++#ifdef HAVE_GSM
++#include <gsm/gsm.h>
++#else
+ #include "gsm/inc/gsm.h"
++#endif
+
+ #ifdef HAVE_SPEEX
+ #include <speex/speex.h>
- diff -Nur twinkle-0.9/src/gui/twinkle.pro twinkle-0.9.new/src/gui/twinkle.pro
- --- twinkle-0.9/src/gui/twinkle.pro 2006-11-25 08:39:02.000000000 +0000
- +++ twinkle-0.9.new/src/gui/twinkle.pro 2006-11-25 08:39:03.000000000 +0000
++diff -Nur twinkle-1.0~beta/src/gui/twinkle.pro twinkle-1.0~beta.new/src/gui/twinkle.pro
++--- twinkle-1.0~beta/src/gui/twinkle.pro 2006-12-29 04:24:24.000000000 +0000
+++++ twinkle-1.0~beta.new/src/gui/twinkle.pro 2007-01-08 21:08:02.000000000 +0000
+@@ -3,7 +3,7 @@
+
+ CONFIG += qt warn_off release thread
+
- -LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex
- +LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex
++-LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a -lsndfile
+++LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a -lsndfile
+
+ DEFINES += QT_NO_STL
+
- diff -Nur twinkle-0.9/src/twinkle_config.h.in twinkle-0.9.new/src/twinkle_config.h.in
- --- twinkle-0.9/src/twinkle_config.h.in 2006-10-01 20:11:58.000000000 +0100
- +++ twinkle-0.9.new/src/twinkle_config.h.in 2006-11-25 08:39:50.000000000 +0000
++diff -Nur twinkle-1.0~beta/src/twinkle_config.h.in twinkle-1.0~beta.new/src/twinkle_config.h.in
++--- twinkle-1.0~beta/src/twinkle_config.h.in 2006-12-29 20:18:31.000000000 +0000
+++++ twinkle-1.0~beta.new/src/twinkle_config.h.in 2007-01-08 21:07:33.000000000 +0000
+@@ -12,6 +12,9 @@
+ /* Defines if your system has the crypt function */
+ #undef HAVE_CRYPT
+
++/* Define to 1 if you have the <libgsm> library. */
++#undef HAVE_GSM
++
+ /* Define to 1 if you have the <ilbc> library. */
+ #undef HAVE_ILBC
+
- @@ -135,22 +138,22 @@
++@@ -132,22 +135,22 @@
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+
+-/* The size of a `char *', as computed by sizeof. */
++/* The size of `char *', as computed by sizeof. */
+ #undef SIZEOF_CHAR_P
+
+-/* The size of a `int', as computed by sizeof. */
++/* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+
+-/* The size of a `long', as computed by sizeof. */
++/* The size of `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+
+-/* The size of a `short', as computed by sizeof. */
++/* The size of `short', as computed by sizeof. */
+ #undef SIZEOF_SHORT
+
+-/* The size of a `size_t', as computed by sizeof. */
++/* The size of `size_t', as computed by sizeof. */
+ #undef SIZEOF_SIZE_T
+
+-/* The size of a `unsigned long', as computed by sizeof. */
++/* The size of `unsigned long', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_LONG
+
+ /* Define to 1 if you have the ANSI C header files. */
diff --cc debian/rules
index c01a411,0000000..48040af
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,40 -1,0 +1,43 @@@
+#!/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
-
- DEBVERSION:=$(shell head -n 1 debian/changelog \
- | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
- UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+
- FILENAME := twinkle_$(UPVERSION).orig.tar.gz
- URL := http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-$(UPVERSION).tar.gz
++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
++
++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 "Debian version: $(DEBVERSION)"
- @@echo "Upstream version: $(UPVERSION)"
++ @@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/watch
index 7ccb8ca,0000000..a4eae0f
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,23 -1,0 +1,8 @@@
- # Example watch control file for uscan
- # Rename this file to "watch" and then you can run the "uscan" command
- # to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
- # Uncomment to examine a Webpage
- # <Webpage URL> <string match>
- #http://www.example.com/downloads.php twinkle-(.*)\.tar\.gz
- http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-(.*)\.tar\.gz debian svn-upgrade
-
- # Uncomment to examine a Webserver directory
- #http://www.example.com/pub/twinkle-(.*)\.tar\.gz
-
- # Uncommment to examine a FTP server
- #ftp://ftp.example.com/pub/twinkle-(.*)\.tar\.gz debian uupdate
-
- # Uncomment to use Roland's hack for sourceforge based projects - YMMV!
- #http://people.debian.org/~lolando/sfdlr.php?project=twinkle twinkle-([\d.]*).tar.gz
-
++opts=dversionmangle=s/~// \
++ http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-(.*)\.tar\.gz debian svn-upgrade
+
--
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