--- twinkle-1.4.2.orig/debian/README.Debian +++ twinkle-1.4.2/debian/README.Debian @@ -0,0 +1,7 @@ +twinkle for Debian +------------------ + +This package has been configured to use the Debian system shared library +libgsm, rather than libgsm included with twinkle. + + -- Mark Purcell , Sun, 29 May 2005 09:40:22 +0100 --- twinkle-1.4.2.orig/debian/twinkle.manpages +++ twinkle-1.4.2/debian/twinkle.manpages @@ -0,0 +1 @@ +debian/twinkle.1 --- twinkle-1.4.2.orig/debian/copyright +++ twinkle-1.4.2/debian/copyright @@ -0,0 +1,125 @@ +This package was debianized by Mark Purcell on +Sun, 29 May 2005 09:40:22 +0100. + +It was downloaded from http://www.twinklephone.com/ + +In order to make twinkle DFSG compliant the audio/ilbc portion of code +has been removed and the package as been built with + ./configure --without-ilbc + +Copyright Holder: + +Author of Twinkle. + +Michel de Boer designed and implemented Twinkle. + +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@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 + * . + * + */ + +src/sockets/dnssrv.cpp: + This software is copyrighted (c) 2002 Rick van Rein, the Netherlands. + + This software has been modified by Michel de Boer. 2005 + --- twinkle-1.4.2.orig/debian/rules +++ twinkle-1.4.2/debian/rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f + +export QTDIR=/usr/share/qt3 + +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 + +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 --without-kde +DEB_AUTO_UPDATE_AUTOCONF := yes + +get-orig-source: + @@dh_testdir + @@[ -d ../tarballs/. ]||mkdir -p ../tarballs + @@echo Downloading $(FILENAME) from $(URL) ... + @@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL) + +help2man: + help2man twinkle -N -n 'Voice over Internet Protocol (VoIP) SIP Phone' -o debian/twinkle.1 --- twinkle-1.4.2.orig/debian/changelog +++ twinkle-1.4.2/debian/changelog @@ -0,0 +1,403 @@ +twinkle (1:1.4.2-2~bpo50+1) lenny-backports; urgency=low + + * Rebuild for lenny-backports. + * Needed backported libzrtpcpp + + -- Matt Taggart Wed, 17 Jun 2009 16:11:56 -0700 + +twinkle (1:1.4.2-2) unstable; urgency=low + + * Drop depreciated KDE3 support: configure --without-kde + - Assist with Debian KDE4 transition + - Fix "Add a light version compiled without kde" (Closes: #367258) + * Fix "FTBFS: seems to fail when building with libzrtpcpp-dev 1.3.0-1" + Updated Build-Depends: (Closes: #519347) + * DEB_AUTO_UPDATE_AUTOCONF regenerate configure (pickup boost_regex-mt.patch) + * Relax Build-Depends: ccrtp >= 1.7.0 + * debian/compat -> 7 + * Update Standards 3.8.1 - no changes + + -- Mark Purcell Sat, 16 May 2009 11:33:53 +1000 + +twinkle (1:1.4.2-1) unstable; urgency=low + + * New upstream release + - libcommoncpp2 transition + + -- Mark Purcell Thu, 26 Feb 2009 18:35:47 +1100 + +twinkle (1:1.4-2) experimental; urgency=low + + * Fix "twinkle_1:1.4-1(sparc/experimental): FTBFS: error: + readline/readline.h: No such file or directory" + - Add Build-Depends: libreadline-dev & libspeexdsp-dev (Closes: #513135) + * Update Description: to match upstream + + -- Mark Purcell Tue, 27 Jan 2009 17:30:42 +1100 + +twinkle (1:1.4-1) experimental; urgency=low + + * New upstream release + * Add Build-Depends: ccrtp >= 1.7.0 + + -- Mark Purcell Mon, 26 Jan 2009 21:47:00 +1100 + +twinkle (1:1.3.2-1) experimental; urgency=low + + * New upstream release + * Add Build-Depends: libmagic-dev + * Patches included upstream; gcc4.3.patch z99-configure-boost.patch + * Distribution experimental while we await lenny + + -- Mark Purcell Fri, 17 Oct 2008 12:19:21 +1100 + +twinkle (1:1.2-3) unstable; urgency=low + + [ Patrick Matthäi ] + * Bump Standards-Version to 3.8.0. + * Converted menu images to xpm and use them at twinkle.menu. + Thanks lintian. + + [ Mark Purcell ] + * Update debian.install: twinkle.desktop & sip.protocol + * Update twinkle.desktop fixes + - linitan:desktop-entry-contains-encoding-key + * Add bug/presubj directing users to upstream user group + * Add debian/twinkle.manpages + * Update debian/menu - menu-icon-too-big. Icons in the Debian menu + system should be at most 32x32 + + -- Mark Purcell Sat, 11 Oct 2008 10:05:06 +1100 + +twinkle (1:1.2-2) unstable; urgency=low + + * Provide gcc4.3.patch to fix build issues + - FTBFS: twinkle_zrtp_ui.h:47: error: 'MessageSeverity' has not been + declared (Closes: #479874) + * Fixup menu entry. Thks Rodrigo Campos + - switch to new debian menu policy (Closes: #475424) + * Update debian/twinkle.1 manpage for 1.2 version + + -- Mark Purcell Sat, 31 May 2008 12:38:57 +1000 + +twinkle (1:1.2-1) unstable; urgency=low + + [ Kilian Krause ] + * Fix menu entry Apps -> Applications + * Add Homepage field as added in dpkg-dev 1.14.6. + + [ Mikael Magnusson ] + * New upstream release (Closes: #465187) + * Add myself to Uploaders. + * Update debian/control package Description. + * Update patches/libgsm.patch. (Partly merged by upstream.) + * Rename patches/configure-boost.patch to + patches/z99-configure-boost.patch (fixes patch order), and update. + + -- Mikael Magnusson Sat, 15 Mar 2008 18:43:10 +0100 + +twinkle (1:1.1-2) unstable; urgency=low + + * Remove obsolete Build-Depends: kdelibs-bin + * Rebuild for libboost transition + + -- Mark Purcell Thu, 16 Aug 2007 18:12:05 +0100 + +twinkle (1:1.1-1) unstable; urgency=low + + * New upstream release + * Rework debian/patches/libgsm.patch + * Rework debian/patches/configure-boost.patch to correctly detect + -lboost_regex-mt... + + -- Mark Purcell Wed, 25 Jul 2007 22:50:26 +0100 + +twinkle (1:1.0.1-1) unstable; urgency=low + + * New upstream release + * debian/patches deleted as included upstream: + - audiocheck.patch + - conf.patch + - incoming.patch + * Rebuild with Depends: libzrtpcpp-0.9-0 (>= 0.9-4) + - Crashes when making/receiving a call (Closes: #420138) + + -- Mark Purcell Sun, 20 May 2007 16:55:03 +0100 + +twinkle (1:1.0-3) unstable; urgency=low + + * Rebuild for libccrtp-dev > 1.5.1 [libccrtp soname] + - twinkle depends on libccrtp1-1.5-0 which is not in sid (Closes: + #418843) + + -- Mark Purcell Thu, 12 Apr 2007 21:43:17 +0100 + +twinkle (1:1.0-2) unstable; urgency=low + + * Add upstream patches; audiocheck, conf & incoming + + -- Mark Purcell Sat, 3 Mar 2007 13:14:15 +0000 + +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 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 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 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 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 Sat, 4 Nov 2006 13:17:50 +0000 + +twinkle (1:0.9-3) unstable; urgency=low + + * Rebuild + + -- Mark Purcell Wed, 1 Nov 2006 21:38:21 +0000 + +twinkle (1:0.9-2) unstable; urgency=low + + * Build-Depends: libzrtpcpp-dev + + -- Mark Purcell 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 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 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 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 Fri, 12 May 2006 21:20:39 +0100 + +twinkle (0.7.1-1) unstable; urgency=low + + * New upstream release + + -- Mark Purcell 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 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 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 Tue, 21 Feb 2006 18:31:51 +0000 + +twinkle (0.6.1-1) unstable; urgency=low + + * New upstream release + + -- Mark Purcell 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 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 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 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 Thu, 24 Nov 2005 07:34:45 +0000 + +twinkle (0.4.1-2) unstable; urgency=low + + * Rebuild against kdelibs 3.4.2 + + -- Mark Purcell 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 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 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 Sat, 29 Oct 2005 22:54:12 +0100 + +twinkle (0.3.2-2) unstable; urgency=low + + * Add Build-Depends: cdbs + + -- Mark Purcell 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 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 Thu, 13 Oct 2005 18:12:02 +0100 + +twinkle (0.2.1-2) unstable; urgency=low + + * Build-Depends: libxml2-dev + + -- Mark Purcell 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 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 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 Thu, 11 Aug 2005 22:16:20 +0100 + --- twinkle-1.4.2.orig/debian/watch +++ twinkle-1.4.2/debian/watch @@ -0,0 +1,8 @@ +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +opts=uversionmangle=s/beta/~beta/ \ + http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-(.*)\.tar\.gz debian svn-upgrade + --- twinkle-1.4.2.orig/debian/control +++ twinkle-1.4.2/debian/control @@ -0,0 +1,97 @@ +Source: twinkle +Section: comm +Priority: optional +Maintainer: Debian VoIP Team +Uploaders: Kilian Krause , Jose Carlos Garcia Sogo , Mark Purcell , Santiago Garcia Mantinan , Mikael Magnusson +Build-Depends: debhelper (>= 7), cdbs, help2man, + autotools-dev, autoconf, + libqt3-mt-dev (>= 3:3.3.0), qt3-apps-dev, + libcommoncpp2-dev (>= 1.4.2), libccrtp-dev, libzrtpcpp-dev (>= 1.4.0), + libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libgsm1-dev, libsndfile1-dev, libspeex-dev, libspeexdsp-dev, + libreadline-dev, + libboost-regex-dev, libxml2-dev, libxpm-dev, libmagic-dev +Standards-Version: 3.8.1 +Homepage: http://www.twinklephone.com/ +Vcs-Svn: svn://svn.debian.org/pkg-voip/twinkle/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/twinkle/?op=log + +Package: twinkle +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Voice over Internet Protocol (VoIP) SIP Phone + 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 + Message Waiting Indication + Voice mail speed dial + 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 + Support for UDP and TCP (new) as transport for SIP + Presence + Instant messaging + Simple file transfer with instant message + Instant message composition indication + Command line interface (CLI) + . + VoIP security + Secure voice communication by ZRTP/SRTP + MD5 digest authentication support for all SIP requests + AKAv1-MD5 digest authentication support for all SIP requests (new) + Identity hiding + . + 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) + . + For all codecs the following preprocessing options are available to improve + quality at the far end of a call. + Automatic gain control (AGC) (new) + Noise reduction (new) + Voice activity detection (VAD) (new) + Acoustic echo control (AEC) [experimental] (new) --- twinkle-1.4.2.orig/debian/compat +++ twinkle-1.4.2/debian/compat @@ -0,0 +1 @@ +7 --- twinkle-1.4.2.orig/debian/menu +++ twinkle-1.4.2/debian/menu @@ -0,0 +1,5 @@ +?package(twinkle):needs="X11" section="Applications/Network/Communication"\ + title="twinkle" command="/usr/bin/twinkle" \ + icon16x16="/usr/share/pixmaps/twinkle-16x16.xpm" \ + icon32x32="/usr/share/pixmaps/twinkle-32x32.xpm" \ + icon="/usr/share/pixmaps/twinkle-32x32.xpm" --- twinkle-1.4.2.orig/debian/twinkle.install +++ twinkle-1.4.2/debian/twinkle.install @@ -0,0 +1,5 @@ +debian/twinkle-32x32.xpm usr/share/pixmaps/ +debian/twinkle-16x16.xpm usr/share/pixmaps/ +debian/bug/* usr/share/bug/twinkle/ +twinkle.desktop usr/share/applications +sip.protocol usr/share/services --- twinkle-1.4.2.orig/debian/twinkle-16x16.xpm +++ twinkle-1.4.2/debian/twinkle-16x16.xpm @@ -0,0 +1,117 @@ +/* XPM */ +static char * twinkle_16x16_xpm[] = { +"16 16 98 2", +" c None", +". c #B2AC17", +"+ c #B5A918", +"@ c #F0EB23", +"# c #EDE622", +"$ c #F8F626", +"% c #938A0C", +"& c #93870A", +"* c #F6F728", +"= c #F8F932", +"- c #B8B110", +"; c #C4BF21", +"> c #F8F933", +", c #F8FA30", +"' c #F0EC1A", +") c #64590B", +"! c #B1A519", +"~ c #BDB121", +"{ c #C0B217", +"] c #C2B514", +"^ c #CDC41C", +"/ c #EDE621", +"( c #B8AF5D", +"_ c #BCB270", +": c #E9E11E", +"< c #F2EE18", +"[ c #E5E013", +"} c #DDD612", +"| c #DBD20F", +"1 c #D6CF11", +"2 c #675E0A", +"3 c #A39814", +"4 c #F6F22A", +"5 c #F9FA31", +"6 c #FAFA33", +"7 c #F8F622", +"8 c #7F82A1", +"9 c #8E8DFE", +"0 c #C2AAF9", +"a c #A292D2", +"b c #EEE91B", +"c c #FAFC16", +"d c #FCFC1E", +"e c #F1EE10", +"f c #827D06", +"g c #6E6406", +"h c #DBD316", +"i c #FBFA2D", +"j c #ECE21A", +"k c #415AFA", +"l c #9D97FE", +"m c #C6B1FA", +"n c #B5A0FA", +"o c #C4B94D", +"p c #F8FA1D", +"q c #D6CF12", +"r c #B4AE18", +"s c #F0E719", +"t c #3D51DA", +"u c #646EFF", +"v c #958AFE", +"w c #7674FD", +"x c #CAC144", +"y c #BFB625", +"z c #F6F620", +"A c #BCB73F", +"B c #4D5CD0", +"C c #4E58DE", +"D c #968E72", +"E c #F0EE1D", +"F c #A9A016", +"G c #A09609", +"H c #F5F418", +"I c #F6F722", +"J c #F2EC27", +"K c #EFE526", +"L c #F0F02E", +"M c #F2F332", +"N c #C8C318", +"O c #BEB30D", +"P c #F5F61E", +"Q c #F4F21F", +"R c #B2A911", +"S c #968D19", +"T c #E8E41D", +"U c #F4F532", +"V c #F5F326", +"W c #F2EA1A", +"X c #ECE71B", +"Y c #867A0B", +"Z c #625807", +"` c #D2CA16", +" . c #F3F226", +".. c #9F9411", +"+. c #8E8009", +"@. c #D3CA13", +"#. c #A29A0D", +"$. c #BFB312", +" ", +" . ", +" + @ ", +" # $ % ", +" & * = - ", +" ; > , ' ", +") ! ~ { ] ^ / ( _ : < [ } | 1 2 ", +" 3 4 5 6 7 8 9 0 a b c d e f ", +" g h i j k l m n o p q ", +" r s t u v w x y ", +" z A B C D E F ", +" G H I J K L M N ", +" O P Q R S T U V ", +" W X Y Z ` ... ", +" +.@. #.$. ", +" "}; --- twinkle-1.4.2.orig/debian/twinkle-32x32.xpm +++ twinkle-1.4.2/debian/twinkle-32x32.xpm @@ -0,0 +1,419 @@ +/* XPM */ +static char * twinkle_32x32_xpm[] = { +"32 32 384 2", +" c None", +". c #695F0A", +"+ c #5D5308", +"@ c #DAD11E", +"# c #66600A", +"$ c #9D910F", +"% c #EFEA24", +"& c #85800B", +"* c #685B0B", +"= c #DACE1E", +"- c #F8F62B", +"; c #DAD119", +"> c #7E6F0B", +", c #EFE726", +"' c #F8F728", +") c #F5EF20", +"! c #504806", +"~ c #D4C412", +"{ c #F7F42C", +"] c #F7F728", +"^ c #F7F422", +"/ c #9F970F", +"( c #4C4205", +"_ c #F3EA18", +": c #F7F630", +"< c #F8F830", +"[ c #F8F520", +"} c #C5BB0F", +"| c #A09208", +"1 c #F5F31F", +"2 c #F7F829", +"3 c #F8F938", +"4 c #E4DE14", +"5 c #716809", +"6 c #C4B70F", +"7 c #F6F627", +"8 c #F8FA31", +"9 c #F8FA35", +"0 c #F8F932", +"a c #F2ED17", +"b c #887F09", +"c c #7E7512", +"d c #E7E224", +"e c #F8F935", +"f c #F9FA38", +"g c #F9FA32", +"h c #F8FA32", +"i c #F7F61E", +"j c #DBD013", +"k c #AAA324", +"l c #F3F429", +"m c #F8F92B", +"n c #F8FA33", +"o c #F8F929", +"p c #F9FA1F", +"q c #F4F218", +"r c #524D0D", +"s c #5E510A", +"t c #71610B", +"u c #71650B", +"v c #8B7916", +"w c #7D6C0D", +"x c #8C7B10", +"y c #81710A", +"z c #8D7B0E", +"A c #8D7C0E", +"B c #98890E", +"C c #B2A718", +"D c #EEED2A", +"E c #F2F11F", +"F c #EDE21E", +"G c #E1D12D", +"H c #DDCF34", +"I c #E6D92A", +"J c #F5F014", +"K c #F7F815", +"L c #F2EE1B", +"M c #E0D614", +"N c #D3C811", +"O c #CCC113", +"P c #C0B60F", +"Q c #BFB10C", +"R c #BBA809", +"S c #BFAF0B", +"T c #B9AD0F", +"U c #ADA40D", +"V c #84790D", +"W c #372F08", +"X c #393108", +"Y c #A29310", +"Z c #D5C920", +"` c #DBD323", +" . c #E3DC2C", +".. c #E5DD2B", +"+. c #ECE224", +"@. c #EEE21A", +"#. c #F3E818", +"$. c #F4EC1D", +"%. c #F4EF24", +"&. c #F5F226", +"*. c #F0ED1A", +"=. c #E3CC21", +"-. c #92897D", +";. c #817FAD", +">. c #8D89BD", +",. c #A195A7", +"'. c #C9B63E", +"). c #EFE513", +"!. c #FAFA1D", +"~. c #FAFB14", +"{. c #FBFC12", +"]. c #FBFC16", +"^. c #FBFA16", +"/. c #F9F817", +"(. c #F9F713", +"_. c #FAF815", +":. c #FAF917", +"<. c #F8F312", +"[. c #8A810B", +"}. c #332C03", +"|. c #AEA214", +"1. c #E7E024", +"2. c #F9F933", +"3. c #F9F937", +"4. c #F9FA33", +"5. c #FAFA2F", +"6. c #F9FA2C", +"7. c #F9FA35", +"8. c #F8F931", +"9. c #F7F723", +"0. c #C3B63B", +"a. c #676FC3", +"b. c #727DFF", +"c. c #9290FE", +"d. c #B8A5FB", +"e. c #BBA6F8", +"f. c #9A8EE9", +"g. c #A49483", +"h. c #F3EC17", +"i. c #F8F91C", +"j. c #FAFC14", +"k. c #FCFC19", +"l. c #FCFC1C", +"m. c #FDFD16", +"n. c #FCFA0E", +"o. c #CBC609", +"p. c #6E6805", +"q. c #81730B", +"r. c #EEE31C", +"s. c #F7F424", +"t. c #F9F930", +"u. c #FAFB31", +"v. c #FAFB3B", +"w. c #F9FA23", +"x. c #F7EF13", +"y. c #7D788E", +"z. c #5469F7", +"A. c #8A8BFE", +"B. c #AA9CFD", +"C. c #C7AFF9", +"D. c #CCB0F7", +"E. c #BAA1F6", +"F. c #9183E5", +"G. c #D8CA25", +"H. c #F7F613", +"I. c #FBFC1E", +"J. c #FBFC24", +"K. c #FBFB21", +"L. c #F9F611", +"M. c #D3CB09", +"N. c #555004", +"O. c #504503", +"P. c #AFA20B", +"Q. c #F0E915", +"R. c #F8F424", +"S. c #FBFB2C", +"T. c #FBFB31", +"U. c #F9F819", +"V. c #E8D212", +"W. c #354FED", +"X. c #566AFF", +"Y. c #9190FF", +"Z. c #B1A1FD", +"`. c #C6B2FB", +" + c #CBB4F8", +".+ c #A494F9", +"++ c #A39679", +"@+ c #F2E911", +"#+ c #F9FB1E", +"$+ c #F9FB20", +"%+ c #F8F71A", +"&+ c #EBE40F", +"*+ c #878104", +"=+ c #262401", +"-+ c #3C3503", +";+ c #988E0A", +">+ c #E9E116", +",+ c #FBF928", +"'+ c #FBFB30", +")+ c #F8F822", +"!+ c #D9C51A", +"~+ c #294AFC", +"{+ c #4F65FF", +"]+ c #8A8CFF", +"^+ c #A79EFE", +"/+ c #C3ADFD", +"(+ c #C6B1FA", +"_+ c #C6AEFA", +":+ c #9D90FC", +"<+ c #908594", +"[+ c #EAE016", +"}+ c #F8FA1E", +"|+ c #F8F918", +"1+ c #DDD513", +"2+ c #8F840A", +"3+ c #595007", +"4+ c #C6BE11", +"5+ c #F0EE2D", +"6+ c #F7F526", +"7+ c #E5D010", +"8+ c #3046DE", +"9+ c #3953FF", +"0+ c #656FFF", +"a+ c #807FFF", +"b+ c #A796FE", +"c+ c #B19CFD", +"d+ c #9C90FE", +"e+ c #7573FE", +"f+ c #938886", +"g+ c #EDE61C", +"h+ c #EEEC2A", +"i+ c #C4B720", +"j+ c #463A07", +"k+ c #4D4808", +"l+ c #A79F15", +"m+ c #F6F420", +"n+ c #F0E40D", +"o+ c #616394", +"p+ c #2B48F9", +"q+ c #4A5DFF", +"r+ c #626BFF", +"s+ c #7979FF", +"t+ c #847FFF", +"u+ c #7373FF", +"v+ c #555CF9", +"w+ c #B8A947", +"x+ c #F1ED25", +"y+ c #C9C12F", +"z+ c #615514", +"A+ c #786A0E", +"B+ c #F4F320", +"C+ c #F6F51B", +"D+ c #CCC126", +"E+ c #5F689A", +"F+ c #3450F7", +"G+ c #475EFF", +"H+ c #4E5FFF", +"I+ c #4B5BFE", +"J+ c #4E55DB", +"K+ c #897C73", +"L+ c #EEE612", +"M+ c #F1F225", +"N+ c #C7BE1C", +"O+ c #978A0A", +"P+ c #F5F41E", +"Q+ c #F8FA28", +"R+ c #F4EF16", +"S+ c #D1C527", +"T+ c #726F88", +"U+ c #4854C2", +"V+ c #424DCE", +"W+ c #5C57AE", +"X+ c #A69655", +"Y+ c #DDD026", +"Z+ c #F1EF1C", +"`+ c #F2F320", +" @ c #DAD31D", +".@ c #6E630D", +"+@ c #B8AD08", +"@@ c #F4F115", +"#@ c #F7F91C", +"$@ c #F7FA1C", +"%@ c #F7F71C", +"&@ c #F5ED1B", +"*@ c #EDDA1A", +"=@ c #EAD115", +"-@ c #EDE11B", +";@ c #EFEE2B", +">@ c #F1F032", +",@ c #F2F331", +"'@ c #F2F329", +")@ c #F0ED20", +"!@ c #827B0C", +"~@ c #5F5406", +"{@ c #CFC40C", +"]@ c #F4F216", +"^@ c #F5F619", +"/@ c #F4F621", +"(@ c #F4F62F", +"_@ c #F4F533", +":@ c #F3F335", +"<@ c #F3F136", +"[@ c #F1F132", +"}@ c #F0F12C", +"|@ c #F1F130", +"1@ c #F3F33A", +"2@ c #F2F435", +"3@ c #F5F422", +"4@ c #B4AC10", +"5@ c #766A05", +"6@ c #EADF0F", +"7@ c #F5F61F", +"8@ c #F5F61B", +"9@ c #F4F620", +"0@ c #F4F322", +"a@ c #EAE619", +"b@ c #C2BA17", +"c@ c #AA9F1C", +"d@ c #D2CA25", +"e@ c #EFEE22", +"f@ c #EFF01D", +"g@ c #F2F330", +"h@ c #F4F63C", +"i@ c #F5F52A", +"j@ c #F4ED1C", +"k@ c #362E07", +"l@ c #9C8F0A", +"m@ c #F3ED15", +"n@ c #F5F622", +"o@ c #F5F61D", +"p@ c #9F9109", +"q@ c #534A09", +"r@ c #5F550B", +"s@ c #D6C91B", +"t@ c #EEEB1B", +"u@ c #F3F427", +"v@ c #F7F837", +"w@ c #F5F631", +"x@ c #F6F422", +"y@ c #716407", +"z@ c #291D07", +"A@ c #E9D712", +"B@ c #F5F21D", +"C@ c #F5F521", +"D@ c #F4F021", +"E@ c #C9BD12", +"F@ c #756806", +"G@ c #3C3104", +"H@ c #9A8C0A", +"I@ c #E7E018", +"J@ c #F6F325", +"K@ c #F3F330", +"L@ c #F3F126", +"M@ c #B1A513", +"N@ c #695407", +"O@ c #F3EA17", +"P@ c #F6F520", +"Q@ c #F5F11A", +"R@ c #D3C510", +"S@ c #5C5108", +"T@ c #877E0A", +"U@ c #DFD411", +"V@ c #F4F11C", +"W@ c #F1F125", +"X@ c #CEC216", +"Y@ c #9F8F09", +"Z@ c #F8F518", +"`@ c #E8E015", +" # c #8A7E08", +".# c #383103", +"+# c #B2A90A", +"@# c #E6DF16", +"## c #EAE119", +"$# c #7B720B", +"%# c #B1A30C", +"&# c #DED314", +"*# c #867709", +"=# c #7A710A", +"-# c #E7D815", +";# c #A3940C", +"># c #817208", +",# c #2E2804", +"'# c #4B3F08", +")# c #856D0C", +" ", +" . ", +" + @ # ", +" $ % & ", +" * = - ; ", +" > , ' ) ! ", +" ~ { ] ^ / ", +" ( _ : < [ } ", +" | 1 2 3 2 4 5 ", +" 6 7 8 9 0 a b ", +" c d e f g h i j ", +" k l m e n o p q r ", +" s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W ", +"X Y Z ` ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[. ", +" }.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.{.k.l.m.n.o.p. ", +" q.r.s.0 t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.j.I.J.K.L.M.N. ", +" O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +D..+++@+#+$+%+&+*+=+ ", +" -+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+ ", +" 3+4+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+ ", +" k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+ ", +" A+B+C+D+E+F+G+H+I+J+K+L+M+N+ ", +" O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@ ", +" +@@@#@$@%@&@*@=@-@;@>@,@'@)@!@ ", +" ~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@ ", +" 5@6@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@ ", +" l@m@n@o@3@h.p@q@ r@s@t@u@v@w@x@y@ ", +" z@A@B@C@D@E@F@ G@H@I@J@K@L@M@ ", +" N@O@P@Q@R@S@ T@U@V@W@X@ ", +" Y@Z@`@ # .#+#@###$# ", +" %#&#*# =#-#;# ", +" >#,# '#)# ", +" "}; --- twinkle-1.4.2.orig/debian/docs +++ twinkle-1.4.2/debian/docs @@ -0,0 +1,2 @@ +README +THANKS --- twinkle-1.4.2.orig/debian/dirs +++ twinkle-1.4.2/debian/dirs @@ -0,0 +1,4 @@ +usr/bin +usr/share/applications +usr/share/services +usr/share/bug/twinkle --- twinkle-1.4.2.orig/debian/twinkle.1 +++ twinkle-1.4.2/debian/twinkle.1 @@ -0,0 +1,118 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH TWINKLE "1" "January 2009" "Twinkle 1.4beta - 04 January 2009" "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 +Set the share directory. +.TP +\fB\-f\fR +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. +.HP +\fB\-\-sip\-port\fR +.IP +Port for SIP signalling. +This port overrides the port from the system settings. +.HP +\fB\-\-rtp\-port\fR +.IP +Port for RTP. +This port overrides the port from the system settings. +.HP +\fB\-\-call\fR
+.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=' +to the address. +.IP +Examples: +twinkle \fB\-\-call\fR 123456 +twinkle \fB\-\-call\fR sip:example@example.com?subject=hello +.HP +\fB\-\-cmd\fR +.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' +.TP +\fB\-\-immediate\fR +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 +.IP +Make 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. +.TP +\fB\-\-show\fR +Instruct a running instance of Twinkle to show the main window +and take focus. +.TP +\fB\-\-hide\fR +Instruct a running instance of Twinkle to hide in the sytem tray. +If no system tray is used, then Twinkle will minimize. +.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-2009 Michel de Boer +http://www.twinklephone.com +.PP +Built with support for: ALSA, KDE, Speex, ZRTP +.PP +Contributions: +* Werner Dittmann (ZRTP/SRTP) +* Bogdan Harjoc (AKAv1\-MD5, Service\-Route) +* Roman Imankulov (command line editing) +* Ondrej Moris (codec preprocessing) +* Rickard Petzall (ALSA) +.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. --- twinkle-1.4.2.orig/debian/patches/boost_regex-mt.patch +++ twinkle-1.4.2/debian/patches/boost_regex-mt.patch @@ -0,0 +1,16 @@ +diff -Nur twinkle-1.0.1/configure.in twinkle-1.0.1.new/configure.in +--- twinkle-1.0.1/configure.in 2007-05-19 15:48:45.000000000 +0100 ++++ twinkle-1.0.1.new/configure.in 2007-05-20 13:26:08.000000000 +0100 +@@ -225,7 +225,11 @@ + AC_CHECK_LIB(boost_regex-gcc, main, [ + LIBS="-lboost_regex-gcc $LIBS" + echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO], +- [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])]) ++ [ ++ AC_CHECK_LIB(boost_regex-mt, main, [ ++ LIBS="-lboost_regex-mt $LIBS" ++ echo "LIBS += -lboost_regex-mt" >> $QT_INCL_PRO], ++ [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])]) + + + $QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro --- twinkle-1.4.2.orig/debian/patches/libgsm.patch +++ twinkle-1.4.2/debian/patches/libgsm.patch @@ -0,0 +1,68 @@ +diff -Nur twinkle-1.2/configure.in twinkle-1.2.new/configure.in +--- twinkle-1.2/configure.in 2008-03-15 22:37:24.000000000 +0100 ++++ twinkle-1.2.new/configure.in 2008-03-15 22:37:25.000000000 +0100 +@@ -188,22 +188,33 @@ + + # This check does not work on all platforms + # 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 library.]) +-# GSM_LIBS="-lgsm" +-# echo "LIBS += -lgsm" >> $QT_INCL_PRO +-# have_gsm="yes" ], [ +-# have_gsm="no" +-# GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a" +-# echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ]) +-have_gsm="no" +-GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a" +-echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ++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 library.]) ++ GSM_LIBS="-lgsm" ++ echo "LIBS += -lgsm" >> $QT_INCL_PRO ++ have_gsm="yes" ], [ ++ have_gsm="no" ++ GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a" ++ echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ]) ++#have_gsm="no" ++#GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a" ++#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO + + AC_SUBST(GSM_LIBS) + ++# 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 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, [], +@@ -319,3 +330,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-1.2/src/twinkle_config.h.in twinkle-1.2.new/src/twinkle_config.h.in +--- twinkle-1.2/src/twinkle_config.h.in 2008-03-09 09:33:02.000000000 +0100 ++++ twinkle-1.2.new/src/twinkle_config.h.in 2008-03-15 22:37:25.000000000 +0100 +@@ -16,6 +16,9 @@ + don't. */ + #undef HAVE_DECL_STRERROR_R + ++/* Define to 1 if you have the library. */ ++#undef HAVE_GSM ++ + /* Define to 1 if you have the library. */ + #undef HAVE_ILBC + --- twinkle-1.4.2.orig/debian/patches/desktop-entry-contains-encoding-key.patch +++ twinkle-1.4.2/debian/patches/desktop-entry-contains-encoding-key.patch @@ -0,0 +1,9 @@ +diff -Nur -x '*.orig' -x '*~' twinkle-1.2/twinkle.desktop.in twinkle-1.2.new/twinkle.desktop.in +--- twinkle-1.2/twinkle.desktop.in 2007-07-24 03:54:16.000000000 +1000 ++++ twinkle-1.2.new/twinkle.desktop.in 2008-10-10 23:45:40.000000000 +1100 +@@ -1,5 +1,4 @@ + [Desktop Entry] +-Encoding=UTF-8 + Name=Twinkle + GenericName=A SIP softphone + Comment=A SIP softphone --- twinkle-1.4.2.orig/debian/bug/presubj +++ twinkle-1.4.2/debian/bug/presubj @@ -0,0 +1,11 @@ +If you know that the bug you want to report is in the "upstream" +code then please file directly with the twinkle users group: + http://groups.yahoo.com/group/twinklephone/ + +If you feel that the bug is one that other Debian users should +know about then you are welcome to file a report in the Debian BTS +as well. Please keep in mind, however, that managing bug reports +is part of the maintainers' workload. + +As a minimum could I ask you to Cc: the usergroup twinklephone@yahoogroups.com +for upstream issues so they are aware of any issues we have.