[Pkg-voip-commits] [twinkle] 13/73: Imported Debian patch 0.6.1-1

Peter Colberg pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:46 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 849c378495add125d1f9cccc3093d177c9019fce
Merge: 98327d9 4d4bf78
Author: Mark Purcell <msp at debian.org>
Date:   Sun Feb 12 08:06:44 2006 +0000

    Imported Debian patch 0.6.1-1

 AUTHORS                                            |    3 +
 ChangeLog                                          |   61 +
 NEWS                                               |   61 +
 configure                                          |  376 ++-
 configure.in                                       |   11 +-
 debian/changelog                                   |   13 +
 debian/control                                     |    2 +-
 debian/rules                                       |    9 +
 src/Makefile.am                                    |    7 +-
 src/Makefile.in                                    |   26 +-
 src/audio/audio_codecs.h                           |   13 +
 src/audio/audio_device.cpp                         |   37 +-
 src/audio/audio_rx.cpp                             |    3 +-
 src/audio/tone_gen.cpp                             |  139 +-
 src/audio/tone_gen.h                               |   37 +-
 src/call_history.cpp                               |   31 +-
 src/call_history.h                                 |    8 +
 src/call_script.cpp                                |  281 ++
 src/call_script.h                                  |   94 +
 src/cmd_socket.cpp                                 |  103 +
 src/{parser/hdr_expires.h => cmd_socket.h}         |   22 +-
 src/dialog.cpp                                     |   92 +-
 src/dialog.h                                       |    3 +
 src/gui/Makefile                                   |  137 +-
 src/gui/dtmfform.ui                                |  164 +-
 src/gui/dtmfform.ui.h                              |   84 +-
 src/gui/freedesksystray.cpp                        |  170 ++
 src/gui/freedesksystray.h                          |  106 +
 src/gui/gui.cpp                                    |  226 +-
 src/gui/gui.h                                      |   25 +
 src/gui/historyform.ui                             |    4 +
 src/gui/historyform.ui.h                           |   24 +-
 src/gui/historylistview.cpp                        |    5 +-
 src/gui/images/auto_answer-disabled.png            |  Bin 0 -> 520 bytes
 src/gui/images/auto_answer.png                     |  Bin 0 -> 809 bytes
 src/gui/images/cancel-disabled.png                 |  Bin 0 -> 515 bytes
 src/gui/images/cf-disabled.png                     |  Bin 0 -> 441 bytes
 src/gui/images/cf.png                              |  Bin 0 -> 628 bytes
 src/gui/images/contexthelp.png                     |  Bin 0 -> 799 bytes
 src/gui/images/edit.png                            |  Bin 0 -> 1242 bytes
 src/gui/images/fileopen                            |  Bin 231 -> 0 bytes
 src/gui/images/fileopen-disabled.png               |  Bin 0 -> 495 bytes
 src/gui/images/fileopen.png                        |  Bin 0 -> 818 bytes
 src/gui/images/gear.png                            |  Bin 0 -> 799 bytes
 src/gui/images/knotify.png                         |  Bin 0 -> 1207 bytes
 src/gui/images/log_small.png                       |  Bin 0 -> 838 bytes
 src/gui/images/missed-disabled.png                 |  Bin 0 -> 411 bytes
 src/gui/images/missed.png                          |  Bin 0 -> 677 bytes
 src/gui/images/no-indication.png                   |  Bin 0 -> 444 bytes
 src/gui/images/qt-logo.png                         |  Bin 0 -> 650 bytes
 src/gui/images/reg-query.png                       |  Bin 0 -> 824 bytes
 src/gui/images/reg_failed-disabled.png             |  Bin 0 -> 583 bytes
 src/gui/images/reg_failed.png                      |  Bin 0 -> 950 bytes
 src/gui/images/settings.png                        |  Bin 0 -> 807 bytes
 src/gui/images/sys_auto_ans.png                    |  Bin 1390 -> 1468 bytes
 src/gui/images/sys_auto_ans_dis.png                |  Bin 827 -> 851 bytes
 src/gui/images/sys_missed.png                      |  Bin 0 -> 1473 bytes
 src/gui/images/sys_missed_dis.png                  |  Bin 0 -> 808 bytes
 src/gui/images/twinkle16-disabled.png              |  Bin 0 -> 449 bytes
 src/gui/inviteform.ui                              |    5 +
 src/gui/inviteform.ui.h                            |   30 +-
 src/gui/main.cpp                                   |  124 +-
 src/gui/mphoneform.ui                              |  952 ++++---
 src/gui/mphoneform.ui.h                            |  679 +++--
 src/gui/selectprofileform.ui                       |    8 +
 src/gui/selectprofileform.ui.h                     |   80 +-
 src/gui/selectuserform.ui                          |    6 +
 src/gui/selectuserform.ui.h                        |    6 +-
 src/gui/syssettingsform.ui                         |  424 +++-
 src/gui/syssettingsform.ui.h                       |  106 +-
 src/gui/termcapform.ui.h                           |    9 +-
 src/gui/twinkle.pro                                |   36 +-
 .../hdr_content_type.h => gui/twinklesystray.cpp}  |   34 +-
 .../hdr_user_agent.h => gui/twinklesystray.h}      |   37 +-
 src/gui/userprofileform.ui                         |  610 ++++-
 src/gui/userprofileform.ui.h                       |  124 +-
 src/line.cpp                                       |   81 +-
 src/line.h                                         |   16 +-
 src/listener.cpp                                   |   13 +-
 src/log.cpp                                        |    7 +
 src/main.cpp                                       |    3 +-
 src/parser/Makefile.am                             |   11 +-
 src/parser/Makefile.in                             |   12 +-
 src/parser/hdr_accept.cpp                          |   21 +-
 src/parser/hdr_accept.h                            |    2 +
 src/parser/hdr_accept_encoding.cpp                 |   19 +-
 src/parser/hdr_accept_encoding.h                   |    2 +
 src/parser/hdr_accept_language.cpp                 |   21 +-
 src/parser/hdr_accept_language.h                   |    2 +
 src/parser/hdr_alert_info.cpp                      |   19 +-
 src/parser/hdr_alert_info.h                        |    2 +
 src/parser/hdr_allow.cpp                           |   20 +-
 src/parser/hdr_allow.h                             |    2 +
 src/parser/hdr_allow_events.cpp                    |   21 +-
 src/parser/hdr_allow_events.h                      |    2 +
 src/parser/hdr_auth_info.cpp                       |   21 +-
 src/parser/hdr_auth_info.h                         |    2 +
 src/parser/hdr_authorization.cpp                   |   24 +
 src/parser/hdr_authorization.h                     |    2 +
 src/parser/hdr_call_id.cpp                         |   17 +-
 src/parser/hdr_call_id.h                           |    2 +
 src/parser/hdr_call_info.cpp                       |   21 +-
 src/parser/hdr_call_info.h                         |    2 +
 src/parser/hdr_contact.cpp                         |   21 +-
 src/parser/hdr_contact.h                           |    2 +
 src/parser/hdr_content_disp.cpp                    |   24 +-
 src/parser/hdr_content_disp.h                      |    2 +
 src/parser/hdr_content_encoding.cpp                |   20 +-
 src/parser/hdr_content_encoding.h                  |    2 +
 src/parser/hdr_content_language.cpp                |   19 +-
 src/parser/hdr_content_language.h                  |    2 +
 src/parser/hdr_content_length.cpp                  |   24 +-
 src/parser/hdr_content_length.h                    |    2 +
 src/parser/hdr_content_type.cpp                    |   21 +-
 src/parser/hdr_content_type.h                      |    2 +
 src/parser/hdr_cseq.cpp                            |   25 +-
 src/parser/hdr_cseq.h                              |    2 +
 src/parser/hdr_date.cpp                            |   56 +-
 src/parser/hdr_date.h                              |    2 +
 src/parser/hdr_error_info.cpp                      |   19 +-
 src/parser/hdr_error_info.h                        |    2 +
 src/parser/hdr_event.cpp                           |   21 +-
 src/parser/hdr_event.h                             |    2 +
 src/parser/hdr_expires.cpp                         |   20 +-
 src/parser/hdr_expires.h                           |    2 +
 src/parser/hdr_from.cpp                            |   21 +-
 src/parser/hdr_from.h                              |    2 +
 src/parser/hdr_in_reply_to.cpp                     |   21 +-
 src/parser/hdr_in_reply_to.h                       |    2 +
 src/parser/hdr_max_forwards.cpp                    |   20 +-
 src/parser/hdr_max_forwards.h                      |    2 +
 src/parser/hdr_mime_version.cpp                    |   21 +-
 src/parser/hdr_mime_version.h                      |    2 +
 src/parser/hdr_min_expires.cpp                     |   21 +-
 src/parser/hdr_min_expires.h                       |    2 +
 src/parser/hdr_organization.cpp                    |   20 +-
 src/parser/hdr_organization.h                      |    2 +
 src/parser/hdr_priority.cpp                        |   20 +-
 src/parser/hdr_priority.h                          |    2 +
 src/parser/hdr_proxy_authenticate.cpp              |   17 +-
 src/parser/hdr_proxy_authenticate.h                |    2 +
 src/parser/hdr_proxy_authorization.cpp             |   24 +
 src/parser/hdr_proxy_authorization.h               |    2 +
 src/parser/hdr_proxy_require.cpp                   |   20 +-
 src/parser/hdr_proxy_require.h                     |    2 +
 src/parser/hdr_rack.cpp                            |   25 +-
 src/parser/hdr_rack.h                              |    2 +
 src/parser/hdr_record_route.cpp                    |   21 +-
 src/parser/hdr_record_route.h                      |    2 +
 src/parser/hdr_refer_to.cpp                        |   21 +-
 src/parser/hdr_refer_to.h                          |    2 +
 src/parser/hdr_referred_by.cpp                     |   21 +-
 src/parser/hdr_referred_by.h                       |    2 +
 src/parser/hdr_reply_to.cpp                        |   20 +-
 src/parser/hdr_reply_to.h                          |    2 +
 src/parser/hdr_require.cpp                         |   20 +-
 src/parser/hdr_require.h                           |    2 +
 src/parser/hdr_retry_after.cpp                     |   24 +-
 src/parser/hdr_retry_after.h                       |    2 +
 src/parser/hdr_route.cpp                           |   20 +-
 src/parser/hdr_route.h                             |    2 +
 src/parser/hdr_rseq.cpp                            |   18 +-
 src/parser/hdr_rseq.h                              |    2 +
 src/parser/hdr_server.cpp                          |   18 +-
 src/parser/hdr_server.h                            |    4 +
 src/parser/hdr_subject.cpp                         |   20 +-
 src/parser/hdr_subject.h                           |    2 +
 src/parser/hdr_subscription_state.cpp              |   25 +-
 src/parser/hdr_subscription_state.h                |    2 +
 src/parser/hdr_supported.cpp                       |   21 +-
 src/parser/hdr_supported.h                         |    2 +
 src/parser/hdr_timestamp.cpp                       |   21 +-
 src/parser/hdr_timestamp.h                         |    2 +
 src/parser/hdr_to.cpp                              |   21 +-
 src/parser/hdr_to.h                                |    2 +
 src/parser/hdr_unsupported.cpp                     |   20 +-
 src/parser/hdr_unsupported.h                       |    2 +
 src/parser/hdr_user_agent.cpp                      |   18 +-
 src/parser/hdr_user_agent.h                        |    2 +
 src/parser/hdr_via.cpp                             |   21 +-
 src/parser/hdr_via.h                               |    2 +
 src/parser/hdr_warning.cpp                         |   20 +-
 src/parser/hdr_warning.h                           |    2 +
 src/parser/hdr_www_authenticate.cpp                |   17 +-
 src/parser/hdr_www_authenticate.h                  |    2 +
 src/parser/header.h                                |   11 +
 src/parser/parser.cxx                              | 2683 ++++++++++----------
 src/parser/parser.h                                |    6 +-
 src/parser/parser.yxx                              |   21 +
 src/parser/request.cpp                             |   18 +-
 src/parser/request.h                               |    4 +
 src/parser/response.cpp                            |   16 +
 src/parser/response.h                              |    1 +
 src/parser/scanner.cxx                             | 1204 ++++-----
 src/parser/scanner.lxx                             |    4 +
 src/parser/sip_message.cpp                         |   78 +
 src/parser/sip_message.h                           |   11 +
 src/phone.cpp                                      |  318 ++-
 src/phone.h                                        |   30 +
 src/phone_user.cpp                                 |   30 +-
 src/protocol.h                                     |    8 +
 src/sdp/Makefile.am                                |    2 +-
 src/sdp/Makefile.in                                |    2 +-
 src/sdp/sdp.cpp                                    |   11 +-
 src/sdp/sdp.h                                      |    5 +-
 src/sdp/sdp_parser.cxx                             |  369 +--
 src/sdp/sdp_parser.h                               |    6 +-
 src/sdp/sdp_parser.yxx                             |    9 +
 src/sdp/sdp_scanner.cxx                            |    2 +-
 src/session.cpp                                    |    9 +-
 src/sockets/interfaces.cpp                         |    6 +-
 src/sockets/interfaces.h                           |    5 +-
 src/sockets/socket.cpp                             |   88 +
 src/sockets/socket.h                               |   21 +
 src/stun/stun.cxx                                  |    1 -
 src/stun/stun_transaction.cpp                      |   35 +-
 src/sys_settings.cpp                               |  138 +-
 src/sys_settings.h                                 |   41 +-
 src/timekeeper.cpp                                 |    1 +
 src/transaction.cpp                                |   38 +-
 src/transaction.h                                  |   13 +
 src/twinkle_config.h.in                            |    3 +
 src/user.cpp                                       |   74 +-
 src/user.h                                         |   17 +-
 src/userintf.cpp                                   |  115 +-
 src/userintf.h                                     |   16 +-
 src/util.cpp                                       |  108 +-
 src/util.h                                         |   24 +-
 twinkle.spec.in                                    |    4 +-
 229 files changed, 8840 insertions(+), 3751 deletions(-)

diff --cc debian/changelog
index 81ed068,0000000..2e9ef1f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,122 -1,0 +1,135 @@@
++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 ba147db,0000000..0aae880
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,43 -1,0 +1,43 @@@
 +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.3.10-4), libccrtp-dev (>=1.3.4), help2man, libqt3-mt-dev (>= 3:3.3.4-4), qt3-apps-dev, automake1.9, libxml2-dev, cdbs, kdelibs-bin, kdelibs4-dev, libasound2-dev [!kfreebsd-i386], libxml2-dev
++Build-Depends: debhelper (>= 4.0.0), autotools-dev, libcommoncpp2-dev (>=1.3.10-4), libccrtp-dev (>=1.3.4), help2man, libqt3-mt-dev (>= 3:3.3.4-4), qt3-apps-dev, automake1.9, libxml2-dev, cdbs, kdelibs-bin, kdelibs4-dev, libasound2-dev [!kfreebsd-i386], libxml2-dev, libgsm1-dev, libsndfile1-dev, libxpm-dev
 +Standards-Version: 3.6.1
 +
 +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.
 + .
 + 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)
 +  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
 +  Reject call transfer request
 +  Call reject
 +  Do not disturb
 +  Auto answer 
 +  Send DTMF digits (RFC 2833) to navigate IVR systems
 +  STUN support for NAT traversal
 +  Send NAT keep alive packets when using STUN
 +  NAT traversal through static provisioning
 + .
 + Website: http://www.twinklephone.com
diff --cc debian/rules
index e36f8da,0000000..f971295
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,11 -1,0 +1,20 @@@
 +#!/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
 +  
 +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
++
++install/digikam::
++	install -D -o root -g root -m 0644 debian/lintian $(CURDIR)/debian/digikam/usr/share/lintian/overrides/digikam
++	mv $(CURDIR)/debian/digikam/usr/share/applnk/Graphics/digikam.desktop $(CURDIR)/debian/digikam/usr/share/applications/kde/
++
++install/digikam::
++	mkdir -p $(CURDIR)/debian/twinkle/usr/share/applications/kde/
++	mv $(CURDIR)/debian/twinkle.desktop $(CURDIR)/debian/twinkle/usr/share/applications/kde/
++

-- 
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