[Pkg-voip-commits] [twinkle] 09/73: Imported Debian patch 0.4.1-1
Peter Colberg
pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:45 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 876965c37f4753544aff4196b493317019d862b4
Merge: f178467 c219fe0
Author: Mark Purcell <msp at debian.org>
Date: Sun Nov 20 23:05:07 2005 +0000
Imported Debian patch 0.4.1-1
ChangeLog | 38 +
Makefile.in | 19 +-
NEWS | 38 +
README | 3 +
THANKS | 2 +
config.guess | 1469 ++++++++++++++++
config.sub | 1563 +++++++++++++++++
configure | 2362 +++++++++++++++-----------
configure.in | 46 +-
data/providers.csv | 5 +-
debian/changelog | 15 +
debian/control | 2 +-
debian/copyright | 99 +-
debian/patches/configure.in.patch | 11 -
debian/patches/twinkle_thread_timings.patch | 88 -
debian/rules | 4 +-
src/Makefile.am | 2 +
src/Makefile.in | 28 +-
src/audio/Makefile.in | 15 +
src/audio/audio_device.cpp | 35 +-
src/audio/audio_device.h | 7 +-
src/audio/audio_rx.cpp | 9 +-
src/audio/audio_rx.h | 3 +
src/audio/audio_session.cpp | 21 +-
src/audio/audio_tx.cpp | 9 +-
src/audio/audio_tx.h | 3 +
src/audio/gsm/Makefile.in | 15 +
src/audio/tone_gen.cpp | 2 +-
src/audits/Makefile.in | 15 +
src/call_history.cpp | 511 ++++++
src/call_history.h | 144 ++
src/dialog.cpp | 50 +-
src/dialog.h | 2 +-
src/events.cpp | 2 +-
src/gui/Makefile | 146 +-
src/gui/getaddressform.ui | 200 +++
src/gui/getaddressform.ui.h | 165 ++
src/gui/gui.cpp | 46 +-
src/gui/gui.h | 9 +-
src/gui/historyform.ui | 376 ++++
src/gui/historyform.ui.h | 256 +++
src/gui/historylistview.cpp | 51 +
src/gui/historylistview.h | 46 +
src/gui/images/1leftarrow-yellow.png | Bin 0 -> 657 bytes
src/gui/images/1rightarrow.png | Bin 0 -> 630 bytes
src/gui/images/cancel.png | Bin 0 -> 890 bytes
src/gui/images/editdelete.png | Bin 0 -> 695 bytes
src/gui/images/kcmpci16.png | Bin 0 -> 836 bytes
src/gui/images/kontact_contacts-disabled.png | Bin 0 -> 521 bytes
src/gui/images/kontact_contacts.png | Bin 0 -> 840 bytes
src/gui/images/ok.png | Bin 0 -> 661 bytes
src/gui/inviteform.ui | 108 +-
src/gui/inviteform.ui.h | 74 +-
src/gui/main.cpp | 107 +-
src/gui/mphoneform.ui | 72 +-
src/gui/mphoneform.ui.h | 154 +-
src/gui/redirectform.ui | 218 ++-
src/gui/redirectform.ui.h | 92 +-
src/gui/selectnicform.ui | 44 +-
src/gui/selectnicform.ui.h | 44 +
src/gui/selectprofileform.ui | 38 +-
src/gui/selectprofileform.ui.h | 74 +-
src/gui/srvredirectform.ui | 705 +++++---
src/gui/srvredirectform.ui.h | 156 +-
src/gui/syssettingsform.ui | 269 ++-
src/gui/syssettingsform.ui.h | 70 +-
src/gui/termcapform.ui | 86 +-
src/gui/termcapform.ui.h | 49 +-
src/gui/transferform.ui | 40 +-
src/gui/transferform.ui.h | 48 +-
src/gui/twinkle.pro | 20 +-
src/line.cpp | 14 +-
src/line.h | 9 +-
src/log.cpp | 6 +
src/log.h | 1 +
src/main.cpp | 44 +-
src/parser/Makefile.in | 15 +
src/parser/hdr_contact.cpp | 13 +
src/parser/hdr_contact.h | 1 +
src/parser/hdr_server.cpp | 18 +-
src/parser/hdr_server.h | 4 +
src/parser/hdr_user_agent.cpp | 18 +-
src/parser/hdr_user_agent.h | 4 +
src/parser/response.cpp | 4 +
src/phone.cpp | 50 +-
src/phone.h | 7 +-
src/sdp/Makefile.in | 15 +
src/service.cpp | 8 +-
src/service.h | 18 +-
src/sockets/Makefile.in | 15 +
src/sockets/interfaces.cpp | 21 +
src/sockets/interfaces.h | 6 +-
src/sockets/url.cpp | 29 +
src/sockets/url.h | 14 +
src/stun/Makefile.in | 15 +
src/stun/stun.cxx | 10 +-
src/subscription.cpp | 19 +
src/sys_settings.cpp | 50 +-
src/sys_settings.h | 11 +
src/threads/Makefile.in | 15 +
src/transaction.cpp | 18 +-
src/transaction_layer.cpp | 8 +-
src/transaction_mgr.cpp | 8 +
src/twinkle_config.h.in | 4 +
src/user.cpp | 4 +-
src/userintf.cpp | 59 +-
src/userintf.h | 7 +
src/util.cpp | 80 +
src/util.h | 15 +
109 files changed, 9176 insertions(+), 1881 deletions(-)
diff --cc debian/changelog
index 7787651,0000000..2529197
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,77 -1,0 +1,92 @@@
++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 73eaf23,0000000..8e3db61
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,42 -1,0 +1,42 @@@
+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, 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
+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.
+ .
+ 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/copyright
index 338d9c7,0000000..485915b
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,80 -1,0 +1,115 @@@
+This package was debianized by Mark Purcell <msp at debian.org> on
+Sun, 29 May 2005 09:40:22 +0100.
+
+It was downloaded from http://www.twinklephone.com/
+
+Copyright Holder:
+
+Author of Twinkle.
+
+Michel de Boer <michel at twinklephone.com> designed and implemented Twinkle.
+
- Twinkle contains the following 3rd party software packages:
- - GSM codec from Jutta Degener and Carsten Bormann
- Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
- Technische Universitaet Berlin
-
- Any use of this software is permitted provided that this notice is not
- removed and that neither the authors nor the Technische Universitaet Berlin
- are deemed to have made any representations as to the suitability of this
- software for any purpose nor are held responsible for any defects of
- this software. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
-
- As a matter of courtesy, the authors request to be informed about uses
- this software has found, about bugs in this software, and about any
- improvements that may be of general interest.
-
- Berlin, 28.11.1994
- Jutta Degener
- Carsten Bormann
-
- - G.711 codec from Sun Microsystems
- The files in this directory comprise ANSI-C language reference implementations
- of the CCITT (International Telegraph and Telephone Consultative Committee)
- G.711, G.721 and G.723 voice compressions. They have been tested on Sun
- SPARCstations and passed 82 out of 84 test vectors published by CCITT
- (Dec. 20, 1988) for G.721 and G.723. [The two remaining test vectors,
- which the G.721 decoder implementation for u-law samples did not pass,
- may be in error because they are identical to two other vectors for G.723_40.]
-
- This source code is released by Sun Microsystems, Inc. to the public domain.
- Please give your acknowledgement in product literature if this code is used
- in your product implementation.
-
+License:
+
+ This package 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.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
++Twinkle contains the following 3rd party software packages:
++- GSM codec from Jutta Degener and Carsten Bormann
+
+Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
+Technische Universitaet Berlin
+
+Any use of this software is permitted provided that this notice is not
+removed and that neither the authors nor the Technische Universitaet Berlin
+are deemed to have made any representations as to the suitability of this
+software for any purpose nor are held responsible for any defects of
+this software. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+
+As a matter of courtesy, the authors request to be informed about uses
+this software has found, about bugs in this software, and about any
+improvements that may be of general interest.
+
+Berlin, 28.11.1994
+Jutta Degener
+Carsten Bormann
++
++- G.711 codec from Sun Microsystems
++The files in this directory comprise ANSI-C language reference implementations
++of the CCITT (International Telegraph and Telephone Consultative Committee)
++G.711, G.721 and G.723 voice compressions. They have been tested on Sun
++SPARCstations and passed 82 out of 84 test vectors published by CCITT
++(Dec. 20, 1988) for G.721 and G.723. [The two remaining test vectors,
++which the G.721 decoder implementation for u-law samples did not pass,
++may be in error because they are identical to two other vectors for G.723_40.]
++
++This source code is released by Sun Microsystems, Inc. to the public domain.
++Please give your acknowledgement in product literature if this code is used
++in your product implementation.
++
++
++src/stun/stun.*
++/* ====================================================================
++ * The Vovida Software License, Version 1.0
++ *
++ * Copyright (c) 2000 Vovida Networks, Inc. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in
++ * the documentation and/or other materials provided with the
++ * distribution.
++ *
++ * 3. The names "VOCAL", "Vovida Open Communication Application Library",
++ * and "Vovida Open Communication Application Library (VOCAL)" must
++ * not be used to endorse or promote products derived from this
++ * software without prior written permission. For written
++ * permission, please contact vocal at vovida.org.
++ *
++ * 4. Products derived from this software may not be called "VOCAL", nor
++ * may "VOCAL" appear in their name, without prior written
++ * permission of Vovida Networks, Inc.
++ *
++ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
++ * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL VOVIDA
++ * NETWORKS, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT DAMAGES
++ * IN EXCESS OF $1,000, NOR FOR ANY INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
++ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
++ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
++ * DAMAGE.
++ *
++ * ====================================================================
++ *
++ * This software consists of voluntary contributions made by Vovida
++ * Networks, Inc. and many individuals on behalf of Vovida Networks,
++ * Inc. For more information on Vovida Networks, Inc., please see
++ * <http://www.vovida.org/>.
++ *
++ */
diff --cc debian/rules
index 24d5248,0000000..e36f8da
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,13 -1,0 +1,11 @@@
+#!/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
+
- DEB_AUTO_UPDATE_AUTOCONF := 2.50
-
- export QTDIR=/usr/lib/qt3
++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
--
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