[Pkg-voip-commits] [twinkle] 03/73: Imported Debian patch 0.2.1-1

Peter Colberg pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:44 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 d8e88cc3d004149cf8c27a9814604547de628c3b
Merge: d2ffeb1 0ff9299
Author: Mark Purcell <msp at debian.org>
Date:   Sun Aug 21 14:05:30 2005 +0100

    Imported Debian patch 0.2.1-1

 AUTHORS                                            |    4 +-
 ChangeLog                                          |   10 +
 INSTALL                                            |   61 +-
 Makefile.am                                        |    3 +-
 Makefile.in                                        |  331 +-
 NEWS                                               |  112 +-
 README                                             |   22 +-
 THANKS                                             |    2 +
 aclocal.m4                                         | 1662 +++++----
 configure                                          | 1369 ++++----
 configure.in                                       |   11 +-
 data/providers.csv                                 |    3 +
 debian/changelog                                   |   11 +
 debian/control                                     |   19 +-
 debian/rules                                       |    4 +-
 depcomp                                            |  184 +-
 install-sh                                         |  515 +--
 missing                                            |  139 +-
 mkinstalldirs                                      |  111 -
 src/Makefile.am                                    |    7 +-
 src/Makefile.in                                    |  341 +-
 src/audio/Makefile.in                              |  275 +-
 src/audio/audio_rx.cpp                             |   32 +-
 src/audio/audio_session.cpp                        |  307 +-
 src/audio/audio_session.h                          |   11 +-
 src/audio/audio_tx.cpp                             |   26 +-
 src/audio/gsm/Makefile.in                          |  568 ++--
 src/audio/tone_gen.cpp                             |   74 +-
 src/audio/tone_gen.h                               |    6 +-
 src/audits/Makefile.in                             |  184 +-
 src/audits/memman.cpp                              |   14 +-
 src/dialog.cpp                                     | 1018 +++++-
 src/dialog.h                                       |  111 +-
 src/events.cpp                                     |  156 +-
 src/events.h                                       |  124 +-
 src/gui/Makefile                                   |  240 +-
 src/gui/authenticationform.ui                      |   12 +-
 src/gui/dtmfform.ui                                |  234 +-
 src/gui/getprofilenameform.ui                      |   11 +-
 src/gui/gui.cpp                                    |  562 +++-
 src/gui/gui.h                                      |   53 +-
 src/gui/images/dtmf-0.png                          |  Bin 0 -> 227 bytes
 src/gui/images/dtmf-1.png                          |  Bin 0 -> 155 bytes
 src/gui/images/dtmf-2.png                          |  Bin 0 -> 495 bytes
 src/gui/images/dtmf-3.png                          |  Bin 0 -> 496 bytes
 src/gui/images/dtmf-4.png                          |  Bin 0 -> 420 bytes
 src/gui/images/dtmf-5.png                          |  Bin 0 -> 393 bytes
 src/gui/images/dtmf-6.png                          |  Bin 0 -> 474 bytes
 src/gui/images/dtmf-7.png                          |  Bin 0 -> 481 bytes
 src/gui/images/dtmf-8.png                          |  Bin 0 -> 463 bytes
 src/gui/images/dtmf-9.png                          |  Bin 0 -> 627 bytes
 src/gui/images/dtmf-a.png                          |  Bin 0 -> 232 bytes
 src/gui/images/dtmf-b.png                          |  Bin 0 -> 236 bytes
 src/gui/images/dtmf-c.png                          |  Bin 0 -> 239 bytes
 src/gui/images/dtmf-d.png                          |  Bin 0 -> 223 bytes
 src/gui/images/dtmf-pound.png                      |  Bin 0 -> 245 bytes
 src/gui/images/dtmf-star.png                       |  Bin 0 -> 247 bytes
 src/gui/images/log.png                             |  Bin 0 -> 1067 bytes
 src/gui/images/transfer-disabled.png               |  Bin 0 -> 333 bytes
 src/gui/images/transfer.png                        |  Bin 0 -> 424 bytes
 src/gui/inviteform.ui                              |   10 +-
 src/gui/logviewform.ui                             |  123 +
 src/gui/logviewform.ui.h                           |   98 +
 src/gui/main.cpp                                   |   28 +-
 src/gui/mphoneform.ui                              |  981 ++++--
 src/gui/mphoneform.ui.h                            |  189 +-
 src/gui/redirectform.ui                            |   11 +-
 src/gui/selectnicform.ui                           |    7 +-
 src/gui/selectprofileform.ui                       |   73 +-
 src/gui/selectprofileform.ui.h                     |   68 +-
 src/gui/srvredirectform.ui                         |   67 +-
 src/gui/syssettingsform.ui                         |  512 +++
 src/gui/syssettingsform.ui.h                       |  132 +
 src/gui/termcapform.ui                             |    5 +-
 src/gui/{inviteform.ui => transferform.ui}         |   94 +-
 src/gui/transferform.ui.h                          |   53 +
 src/gui/twinkle.pro                                |   59 +-
 src/gui/userprofileform.ui                         | 1310 +++++---
 src/gui/userprofileform.ui.h                       |  116 +-
 src/gui/wizardform.ui                              |  360 ++
 src/gui/wizardform.ui.h                            |  240 ++
 src/line.cpp                                       |  304 +-
 src/line.h                                         |   87 +-
 src/listener.cpp                                   |   94 +-
 src/log.cpp                                        |  133 +-
 src/log.h                                          |   30 +-
 src/main.cpp                                       |   21 +-
 src/parser/Makefile.am                             |   20 +
 src/parser/Makefile.in                             |  354 +-
 src/parser/definitions.cpp                         |    6 +
 src/parser/definitions.h                           |    3 +
 src/parser/hdr_allow.cpp                           |    4 +
 src/parser/hdr_allow.h                             |    1 +
 src/parser/{hdr_allow.h => hdr_allow_events.cpp}   |   43 +-
 src/parser/{hdr_allow.h => hdr_allow_events.h}     |   19 +-
 src/parser/{sip_body.cpp => hdr_event.cpp}         |   56 +-
 src/parser/{hdr_allow.h => hdr_event.h}            |   28 +-
 src/parser/{hdr_allow.cpp => hdr_refer_to.cpp}     |   66 +-
 src/parser/{hdr_allow.h => hdr_refer_to.h}         |   31 +-
 src/parser/{hdr_allow.cpp => hdr_referred_by.cpp}  |   74 +-
 src/parser/{hdr_allow.h => hdr_referred_by.h}      |   33 +-
 src/parser/hdr_subscription_state.cpp              |   80 +
 .../{hdr_allow.h => hdr_subscription_state.h}      |   43 +-
 src/parser/parse_ctrl.h                            |    5 +-
 src/parser/parser.cxx                              | 3510 ++++++++++----------
 src/parser/parser.h                                |  206 +-
 src/parser/parser.yxx                              |  129 +-
 src/parser/request.cpp                             |   40 +-
 src/parser/request.h                               |    2 +-
 src/parser/response.cpp                            |   37 +-
 src/parser/response.h                              |   11 +-
 src/parser/scanner.cxx                             | 1949 ++++++-----
 src/parser/scanner.lxx                             |   45 +-
 src/parser/sip_body.cpp                            |   28 +
 src/parser/sip_body.h                              |   18 +-
 src/parser/sip_message.cpp                         |   26 +-
 src/parser/sip_message.h                           |   22 +-
 src/phone.cpp                                      |  503 ++-
 src/phone.h                                        |   51 +-
 src/protocol.h                                     |   64 +
 src/sdp/Makefile.am                                |   10 +
 src/sdp/Makefile.in                                |  239 +-
 src/sdp/sdp.cpp                                    |    3 +-
 src/sdp/sdp_parser.cxx                             |  699 ++--
 src/sdp/sdp_parser.h                               |   20 +-
 src/sdp/sdp_parser.yxx                             |   17 +-
 src/sdp/sdp_scanner.cxx                            |    2 +-
 src/sender.cpp                                     |  136 +-
 src/service.cpp                                    |   13 +
 src/service.h                                      |    7 +
 src/session.cpp                                    |   32 +-
 src/session.h                                      |   16 +
 src/sockets/Makefile.in                            |  187 +-
 src/sockets/socket.cpp                             |   59 +-
 src/sockets/socket.h                               |   18 +-
 src/sockets/url.cpp                                |    1 +
 src/stun/Makefile.am                               |   11 +
 src/{sockets => stun}/Makefile.in                  |  233 +-
 src/stun/stun.cxx                                  | 2589 +++++++++++++++
 src/stun/stun.h                                    |  405 +++
 src/stun/stun_transaction.cpp                      |  514 +++
 src/stun/stun_transaction.h                        |  147 +
 src/stun/udp.cxx                                   |  349 ++
 src/stun/udp.h                                     |  156 +
 src/sub_refer.cpp                                  |  333 ++
 src/sub_refer.h                                    |   67 +
 src/subscription.cpp                               |  435 +++
 src/subscription.h                                 |  128 +
 src/sys_settings.cpp                               |  338 ++
 src/sys_settings.h                                 |   46 +
 src/threads/Makefile.in                            |  186 +-
 src/timekeeper.cpp                                 |  159 +-
 src/timekeeper.h                                   |   57 +-
 src/transaction.cpp                                |    3 +
 src/transaction_layer.cpp                          |   48 +-
 src/transaction_layer.h                            |    8 +
 src/transaction_mgr.cpp                            |  189 +-
 src/transaction_mgr.h                              |   17 +-
 src/user.cpp                                       |   70 +-
 src/user.h                                         |   54 +-
 src/userintf.cpp                                   |  318 +-
 src/userintf.h                                     |   26 +
 src/util.cpp                                       |   17 +
 src/util.h                                         |    7 +
 164 files changed, 22075 insertions(+), 7945 deletions(-)

diff --cc debian/changelog
index 0d05a2e,0000000..37f90ec
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,0 +1,25 @@@
++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 b071e9c,0000000..48a1790
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,32 -1,0 +1,41 @@@
 +Source: twinkle
 +Section: comm
 +Priority: optional
 +Maintainer: Mark Purcell <msp at debian.org>
- Build-Depends: debhelper (>= 4.0.0), autotools-dev, libcommoncpp2-dev (>=1.3.10-4), libccrtp-dev (>=1.3.1-4), help2man, libqt3-mt-dev (>= 3:3.3.4-4)
++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
 +Standards-Version: 3.6.1
 +
 +Package: twinkle
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +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.
++ 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. 
++ 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 (new)
++  Reject call transfer request (new)
 +  Call reject
 +  Do not disturb
-   Send DTMF digits to navigate IVR systems
++  Auto answer (new)
++  Send DTMF digits (RFC 2833) to navigate IVR systems
++  STUN support for NAT traversal (new)
++  Send NAT keep alive packets when using STUN (new)
 +  NAT traversal through static provisioning
 + .
-  Upstream: http://www.twinklephone.com
++ Website: http://www.twinklephone.com
diff --cc debian/rules
index cdf74e0,0000000..306c31d
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,112 -1,0 +1,112 @@@
 +#!/usr/bin/make -f
 +# -*- makefile -*-
 +# Sample debian/rules that uses debhelper.
 +# This file was originally written by Joey Hess and Craig Small.
 +# As a special exception, when this file is copied by dh-make into a
 +# dh-make output file, you may use that output file without restriction.
 +# This special exception was added by Craig Small in version 0.37 of dh-make.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
 +
 +# These are used for cross-compiling and for saving the configure script
 +# from having to guess our platform (since we know it already)
 +DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 +DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 +
 +
 +CFLAGS = -Wall -g
 +
 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 +	CFLAGS += -O0
 +else
 +	CFLAGS += -O2
 +endif
 +
 +config.status: configure
 +	dh_testdir
 +	# Add here commands to configure the package.
 +	QTDIR=/usr/lib/qt3 CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 +
 +
 +build: build-stamp
 +
 +build-stamp:  config.status
 +	dh_testdir
 +
 +	# Add here commands to compile the package.
- 	$(MAKE)
++	QTDIR=/usr/lib/qt3 $(MAKE)
 +	#docbook-to-man debian/twinkle.sgml > twinkle.1
 +	/usr/bin/help2man -N -S 'Debian GNU/Linux' src/twinkle -o twinkle.1
 +
 +	touch build-stamp
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp 
 +
 +	# Add here commands to clean up after the build process.
 +	-$(MAKE) distclean
 +	
 +	# Cleanup what make distclean doesn't
- 	rm -f twinkle.1 qtccxxincl.pro src/gui/Makefile
++	rm -f twinkle.1 qtccxxincl.pro 
 +	
 +#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 +#	cp -f /usr/share/misc/config.sub config.sub
 +#endif
 +#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 +#	cp -f /usr/share/misc/config.guess config.guess
 +#endif
 +
 +
 +	dh_clean 
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
 +	dh_clean -k 
 +	dh_installdirs
 +
 +	# Add here commands to install the package into debian/twinkle.
 +	$(MAKE) install DESTDIR=$(CURDIR)/debian/twinkle
 +
 +
 +# Build architecture-independent files here.
 +binary-indep: build install
 +# We have nothing to do by default.
 +
 +# Build architecture-dependent files here.
 +binary-arch: build install
 +	dh_testdir
 +	dh_testroot
 +	dh_installchangelogs ChangeLog
 +	dh_installdocs
 +	dh_installexamples
 +#	dh_install
 +	dh_installmenu
 +#	dh_installdebconf	
 +#	dh_installlogrotate
 +#	dh_installemacsen
 +#	dh_installpam
 +#	dh_installmime
 +#	dh_installinit
 +#	dh_installcron
 +#	dh_installinfo
 +	dh_installman twinkle.1
 +	dh_link
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
 +#	dh_perl
 +#	dh_python
 +	dh_makeshlibs
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install 

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