[Pkg-voip-commits] [twinkle] 19/73: Imported Debian patch 0.8.dfsg-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 ca52a3269c0bcf18de7d2f829a5572c74fb12c7b
Merge: d25fba1 d83afee
Author: Mark Purcell <msp at debian.org>
Date: Sun Jul 2 21:37:09 2006 +0100
Imported Debian patch 0.8.dfsg-1
AUTHORS | 1 +
ChangeLog | 44 +
Makefile.am | 11 +-
Makefile.in | 13 +-
NEWS | 44 +
configure | 281 ++-
configure.in | 28 +-
debian/changelog | 7 +
debian/control | 2 +-
debian/copyright | 4 +
debian/patches/libgsm.diff | 137 +-
debian/rules | 3 +
sip.protocol | 12 +
src/Makefile.am | 4 +-
src/Makefile.in | 5 +-
src/audio/Makefile.am | 4 +-
src/audio/Makefile.in | 11 +-
src/audio/audio_codecs.cpp | 1 +
src/audio/audio_codecs.h | 1 +
src/audio/audio_decoder.cpp | 336 +++
src/audio/audio_decoder.h | 160 ++
src/audio/audio_device.cpp | 6 +-
src/audio/audio_encoder.cpp | 61 +-
src/audio/audio_encoder.h | 23 +-
src/audio/audio_rx.cpp | 23 +-
src/audio/audio_session.cpp | 10 +-
src/audio/audio_tx.cpp | 368 +---
src/audio/audio_tx.h | 22 +-
src/audio/dtmf_player.cpp | 12 +-
src/audio/g711.cpp | 94 +-
src/audio/g711.h | 8 +-
src/audio/tone_gen.cpp | 14 +-
src/audio/tone_gen.h | 6 +-
src/auth.cpp | 8 +-
src/call_history.cpp | 4 +-
src/call_script.cpp | 265 ++-
src/call_script.h | 31 +-
src/dialog.cpp | 134 +-
src/gui/Makefile | 68 +-
src/gui/address_finder.cpp | 97 +
src/gui/address_finder.h | 71 +
src/gui/getaddressform.ui | 2 +
src/gui/getaddressform.ui.h | 6 +-
src/gui/gui.cpp | 198 +-
src/gui/gui.h | 17 +-
src/gui/images/kontact_contacts32.png | Bin 0 -> 3039 bytes
src/gui/main.cpp | 76 +-
src/gui/mphoneform.ui | 960 +++++----
src/gui/mphoneform.ui.h | 18 +-
src/gui/numberconversionform.ui | 172 ++
src/gui/numberconversionform.ui.h | 76 +
src/gui/selectnicform.ui.h | 2 +-
src/gui/selectprofileform.ui | 9 +-
src/gui/selectprofileform.ui.h | 57 +-
src/gui/syssettingsform.ui | 413 +++-
src/gui/syssettingsform.ui.h | 278 ++-
src/gui/transferform.ui.h | 2 +-
src/gui/twinkle.pro | 14 +-
src/gui/userprofileform.ui | 3610 +++++++++++++++++++++------------
src/gui/userprofileform.ui.h | 601 ++++--
src/gui/wizardform.ui.h | 20 +-
src/line.cpp | 46 +-
src/line.h | 8 +
src/log.cpp | 10 +-
src/main.cpp | 16 +-
src/parser/hdr_from.cpp | 8 +
src/parser/hdr_from.h | 10 +
src/parser/hdr_record_route.cpp | 21 +
src/parser/hdr_record_route.h | 2 +
src/parser/hdr_route.cpp | 21 +
src/parser/hdr_route.h | 2 +
src/parser/hdr_via.cpp | 25 +
src/parser/hdr_via.h | 2 +
src/parser/parameter.cpp | 4 +
src/parser/parameter.h | 2 +
src/parser/parse_ctrl.cpp | 1 +
src/parser/parse_ctrl.h | 3 +
src/parser/request.cpp | 16 +-
src/phone.cpp | 106 +-
src/phone.h | 7 +-
src/phone_user.cpp | 40 +-
src/phone_user.h | 2 +-
src/protocol.h | 10 +-
src/sdp/sdp.cpp | 33 +
src/sdp/sdp.h | 13 +
src/service.cpp | 226 ++-
src/service.h | 13 +-
src/session.cpp | 100 +-
src/session.h | 1 +
src/sockets/url.cpp | 114 +-
src/sockets/url.h | 17 +
src/stun/stun_transaction.cpp | 24 +-
src/sub_refer.cpp | 8 +-
src/subscription.cpp | 4 +-
src/sys_settings.cpp | 626 +++++-
src/sys_settings.h | 104 +-
src/transaction_mgr.cpp | 8 +-
src/twinkle_config.h.in | 6 +
src/user.cpp | 1344 +++++++++++-
src/user.h | 218 +-
src/userintf.cpp | 87 +-
src/userintf.h | 4 +
src/util.cpp | 10 +-
src/util.h | 4 +
twinkle.desktop.in | 11 +
twinkle.spec.in | 2 +
106 files changed, 9291 insertions(+), 3013 deletions(-)
diff --cc debian/changelog
index 75f6af5,0000000..54c9ef7
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,176 -1,0 +1,183 @@@
++twinkle (0.8.dfsg-1) unstable; urgency=low
++
++ * New upstream release
++ * Remove non-free iLBC code from DFSG release
++
++ -- Mark Purcell <msp at debian.org> Sun, 2 Jul 2006 21:37:09 +0100
++
+twinkle (0.7.1-2) unstable; urgency=low
+
+ * Enable sip URIs: debian/sip.protocol
+ - Twinkle won't manage sip URI from Konqueror (Closes: #366975)
+
+ -- Mark Purcell <msp at debian.org> Fri, 12 May 2006 21:20:39 +0100
+
+twinkle (0.7.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 7 May 2006 23:00:03 +0100
+
+twinkle (0.7-1) unstable; urgency=low
+
+ * New upstream release
+ * Update debian/control. Fixes FTBFS on kfreebsd-amd64: unsatisfied
+ Build-Depends (Closes: #361483)
+ * Rebuild with updated libccrtp & libcommoncpp2
+ - Fixes: libccext2-1.3.so.1: cannot open shared object file (Closes: #362440)
+ * Installed debian/twinkle.desktop. Fixes: please install a .desktop
+ file (Closes: #358398)
+ * Add Build-Depends: libspeex-dev
+ * Modify debian/patches/libgsm.diff
+
+ -- Mark Purcell <msp at debian.org> Mon, 1 May 2006 12:21:03 +0100
+
+twinkle (0.6.2-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/patches/gui.cpp.diff removed as applied upstream
+
+ -- Mark Purcell <msp at debian.org> Sun, 26 Feb 2006 17:46:56 +0000
+
+twinkle (0.6.1-2) unstable; urgency=low
+
+ * Add debian/patches/libgsm.diff to use Build-Depends: libgsm1-dev
+ * Add debian/patches/gui.cpp.diff (Closes: Bug#352534)
+
+ -- Mark Purcell <msp at debian.org> Tue, 21 Feb 2006 18:31:51 +0000
+
+twinkle (0.6.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 12 Feb 2006 08:06:44 +0000
+
+twinkle (0.6-1) UNRELEASED; urgency=low
+
+ * (NOT RELEASED YET) New upstream release
+ * Add Build-Depends: libxpm-dev, libsndfile1-dev
+
+ -- Mark Purcell <msp at debian.org> Fri, 10 Feb 2006 10:32:07 +1100
+
+twinkle (0.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Don't ship upstream NEWS as it is a duplicate of upstream ChangeLog
+ * Remove usr/sbin from debian/dirs
+
+ -- Mark Purcell <msp at debian.org> Tue, 17 Jan 2006 16:53:16 +0000
+
+twinkle (0.4.2-1) unstable; urgency=low
+
+ * New upstream release
+ - Lines hang with "dialing" status (Closes: #340779)
+ - does not play ringtone (Closes: #340233)
+
+ -- Mark Purcell <msp at debian.org> Tue, 29 Nov 2005 20:47:21 +0000
+
+twinkle (0.4.1-3) unstable; urgency=low
+
+ * Rebuild against kdelibs 3.4.2 for unstable
+ - twinkle is not installable on sid (Closes: #340534)
+ * Suggests: kaddressbook
+
+ -- Mark Purcell <msp at debian.org> Thu, 24 Nov 2005 07:34:45 +0000
+
+twinkle (0.4.1-2) unstable; urgency=low
+
+ * Rebuild against kdelibs 3.4.2
+
+ -- Mark Purcell <msp at debian.org> Tue, 22 Nov 2005 20:16:05 +0000
+
+twinkle (0.4.1-1) unstable; urgency=low
+
+ * New upstream release
+ - FTBFS on 64 bit arches: cast from 'void*' to 'int' loses precision
+ (Closes: #324395)
+ - ftbfs [sparc] stun.cxx:680: error: 'gethrtime' was not declared in
+ this scope (Closes: #336746)
+ * Fix Build-Depends: FTBFS on GNU/kFreeBSD (Closes: #336859)
+ * Copyright audit to debian/copyright
+ * Use correct QTDIR=/usr/share/qt3, negates need for
+ DEB_AUTO_UPDATE_AUTOCONF
+ * Remove patch against configure.in
+
+ -- Mark Purcell <msp at debian.org> Sun, 20 Nov 2005 23:05:07 +0000
+
+twinkle (0.3.2-4) unstable; urgency=low
+
+ * Add Build-Depends: kdelibs4-dev kdelibs-bin, libasounds2-dev, libxml2-dev
+ - fix ppc build (Closes: #325057)
+ * Remove ppc-build patch, obsolete by upstream v 0.3
+
+ -- Mark Purcell <msp at debian.org> Sun, 30 Oct 2005 07:56:45 +0000
+
+twinkle (0.3.2-3) unstable; urgency=low
+
+ * Use DEB_AUTO_UPDATE_AUTOCONF to rebuild configure from patched
+ configure.in. Ugly..
+
+ -- Mark Purcell <msp at debian.org> Sat, 29 Oct 2005 22:54:12 +0100
+
+twinkle (0.3.2-2) unstable; urgency=low
+
+ * Add Build-Depends: cdbs
+
+ -- Mark Purcell <msp at debian.org> Sat, 29 Oct 2005 17:45:43 +0100
+
+twinkle (0.3.2-1) unstable; urgency=low
+
+ * New upstream release
+ - New upstream version available (Closes: #334615)
+ * FTBFS on 64 bit arches: cast from 'void*' to 'int' loses precision
+ (Closes: #324395)
+ * Patch from Guido Guenther
+ - fix ppc build (Closes: #325057)
+ * Patch from Mikael Magnusson
+ - Thread creation timing bug causes crashes (Closes: #329433)
+ * Fix: old-fsf-address-in-copyright-file
+
+ -- Mark Purcell <msp at debian.org> Sat, 29 Oct 2005 16:46:40 +0100
+
+twinkle (0.3-1) unstable; urgency=low
+
+ [ Kilian Krause ]
+ * Debian VoIP upload
+
+ [ Mark Purcell ]
+ * New upstream release
+ * Switch to cdbs!
+
+ -- Mark Purcell <msp at debian.org> Thu, 13 Oct 2005 18:12:02 +0100
+
+twinkle (0.2.1-2) unstable; urgency=low
+
+ * Build-Depends: libxml2-dev
+
+ -- Mark Purcell <msp at debian.org> Sun, 21 Aug 2005 15:55:13 +0100
+
+twinkle (0.2.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Build-Depends: libccrtp-dev (>=1.3.4)
+ * Add Build-Depends: qt3-apps-dev
+ * Add Build-Depends: automake1.9
+ * Export QTDIR for build target as well :-(
+ * Update extended description
+
+ -- Mark Purcell <msp at debian.org> Sun, 21 Aug 2005 14:05:30 +0100
+
+twinkle (0.1-2) unstable; urgency=low
+
+ * C++ migration
+ * Build-Depends: libqt3-mt-dev (>= 3:3.3.4-4)
+
+ -- Mark Purcell <msp at debian.org> Thu, 18 Aug 2005 21:02:31 +0100
+
+twinkle (0.1-1) experimental; urgency=low
+
+ * Upload to experimental while c++ transition
+ * Initial release Closes: #311150
+
+ -- Mark Purcell <msp at debian.org> Thu, 11 Aug 2005 22:16:20 +0100
+
diff --cc debian/control
index 0e47b82,0000000..2ff73a9
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 !kfreebsd-amd64 !hurd-i386], libxml2-dev, libgsm1-dev, libsndfile1-dev, libxpm-dev, libspeex-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-3), qt3-apps-dev, automake1.9, libxml2-dev, cdbs, kdelibs-bin, kdelibs4-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml2-dev, libgsm1-dev, libsndfile1-dev, libxpm-dev, libspeex-dev, libboost-regex-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/copyright
index 485915b,0000000..05638af
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,115 -1,0 +1,119 @@@
+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/
+
++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 <michel at twinklephone.com> 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 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/patches/libgsm.diff
index 6d03dd5,0000000..5d3fadb
mode 100644,000000..100644
--- a/debian/patches/libgsm.diff
+++ b/debian/patches/libgsm.diff
@@@ -1,80 -1,0 +1,119 @@@
- diff -ur orig/twinkle-0.6.1/configure.in twinkle-0.6.1/configure.in
- --- orig/twinkle-0.6.1/configure.in 2006-02-11 14:40:40.000000000 +0000
- +++ twinkle-0.6.1/configure.in 2006-02-21 10:49:26.000000000 +0000
- @@ -133,6 +133,12 @@
- echo "LIBS += -lasound" >> $QT_INCL_PRO
- ])
++diff -Nur twinkle-0.8.dfsg/configure twinkle-0.8.dfsg.new/configure
++--- twinkle-0.8.dfsg/configure 2006-07-01 08:22:54.000000000 +0100
+++++ twinkle-0.8.dfsg.new/configure 2006-07-06 23:10:48.000000000 +0100
++@@ -17185,7 +17185,7 @@
++ PARSER_CXXFLAGS=`echo $CXXFLAGS | sed -e "s/\-O2//;s/\-Os//"`
++
++
++- ac_config_files="$ac_config_files Makefile src/Makefile src/audio/Makefile src/audio/gsm/Makefile src/audio/ilbc/Makefile src/audits/Makefile src/sdp/Makefile src/parser/Makefile src/sockets/Makefile src/stun/Makefile src/threads/Makefile twinkle.spec"
+++ ac_config_files="$ac_config_files Makefile src/Makefile src/audio/Makefile src/audio/gsm/Makefile src/audits/Makefile src/sdp/Makefile src/parser/Makefile src/sockets/Makefile src/stun/Makefile src/threads/Makefile twinkle.spec"
++ cat >confcache <<\_ACEOF
++ # This file is a shell script that caches the results of configure
++ # tests run on this system so they can be shared between configure
++@@ -17760,7 +17760,6 @@
++ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
++ "src/audio/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/Makefile" ;;
++ "src/audio/gsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/gsm/Makefile" ;;
++- "src/audio/ilbc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/ilbc/Makefile" ;;
++ "src/audits/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audits/Makefile" ;;
++ "src/sdp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/sdp/Makefile" ;;
++ "src/parser/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/parser/Makefile" ;;
++diff -Nur twinkle-0.8.dfsg/configure.in twinkle-0.8.dfsg.new/configure.in
++--- twinkle-0.8.dfsg/configure.in 2006-06-30 21:11:07.000000000 +0100
+++++ twinkle-0.8.dfsg.new/configure.in 2006-07-06 23:11:33.000000000 +0100
++@@ -127,6 +127,12 @@
++ AC_CHECK_LIB(sndfile, sf_open, [],
++ [AC_MSG_ERROR([libsndfile library is missing.])])
+
++# Check if libgsm is available
++AC_CHECK_LIB(gsm, sf_open, [],
++ [AC_MSG_ERROR([libgsm library is missing.])])
++AC_CHECK_HEADER(gsm.h, [],
++ [AC_MSG_ERROR([gsm header files msiing (gsm.h)])])
++
- $QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
- echo "distdir:" >> src/gui/Makefile
++ # Check if ALSA is available
++ AC_CHECK_LIB(asound, main, [
++ AC_CHECK_HEADER(alsa/asoundlib.h, [],
++@@ -173,7 +179,6 @@
++ AC_SUBST(PARSER_CXXFLAGS)
++
++ AC_OUTPUT(Makefile src/Makefile src/audio/Makefile src/audio/gsm/Makefile \
++- src/audio/ilbc/Makefile \
++ src/audits/Makefile src/sdp/Makefile src/parser/Makefile \
++ src/sockets/Makefile src/stun/Makefile src/threads/Makefile \
++ twinkle.spec)
++diff -Nur twinkle-0.8.dfsg/src/Makefile.am twinkle-0.8.dfsg.new/src/Makefile.am
++--- twinkle-0.8.dfsg/src/Makefile.am 2006-06-22 21:32:19.000000000 +0100
+++++ twinkle-0.8.dfsg.new/src/Makefile.am 2006-07-06 23:11:33.000000000 +0100
++@@ -16,13 +16,12 @@
++ $(top_builddir)/src/sockets/libsocket.a\
++ $(top_builddir)/src/threads/libthread.a\
++ $(top_builddir)/src/audio/libaudio.a\
++- $(top_builddir)/src/audio/gsm/libgsm.a\
++- $(top_builddir)/src/audio/ilbc/libilbc.a\
++ $(top_builddir)/src/audits/libaudits.a\
++ $(top_builddir)/src/stun/libstun.a\
++ $(CCRTP_LIBS)\
++ -lresolv\
++ -lsndfile\
+++ -lgsm\
++ -lboost_regex
++
++ libtwinkle_a_SOURCES =\
++diff -Nur twinkle-0.8.dfsg/src/audio/Makefile.am twinkle-0.8.dfsg.new/src/audio/Makefile.am
++--- twinkle-0.8.dfsg/src/audio/Makefile.am 2006-05-13 08:57:01.000000000 +0100
+++++ twinkle-0.8.dfsg.new/src/audio/Makefile.am 2006-07-06 23:11:33.000000000 +0100
++@@ -37,6 +37,4 @@
++ tone_gen.h\
++ twinkle_rtp_session.h
++
++-SUBDIRS = gsm ilbc
++-
++ EXTRA_DIST = README_G711
++diff -Nur twinkle-0.8.dfsg/src/audio/audio_decoder.h twinkle-0.8.dfsg.new/src/audio/audio_decoder.h
++--- twinkle-0.8.dfsg/src/audio/audio_decoder.h 2006-05-13 09:24:32.000000000 +0100
+++++ twinkle-0.8.dfsg.new/src/audio/audio_decoder.h 2006-07-06 23:11:33.000000000 +0100
++@@ -25,7 +25,7 @@
++ #include "twinkle_config.h"
++ #include "audio_codecs.h"
++ #include "user.h"
++-#include "gsm/inc/gsm.h"
+++#include <gsm.h>
+
- diff -Nur twinkle-0.7/src/audio/audio_encoder.h twinkle-0.7.new/src/audio/audio_encoder.h
- --- twinkle-0.7/src/audio/audio_encoder.h 2006-04-16 19:51:14.000000000 +0100
- +++ twinkle-0.7.new/src/audio/audio_encoder.h 2006-05-01 22:25:49.000000000 +0100
++ #ifdef HAVE_SPEEX
++ #include <speex/speex.h>
++diff -Nur twinkle-0.8.dfsg/src/audio/audio_encoder.h twinkle-0.8.dfsg.new/src/audio/audio_encoder.h
++--- twinkle-0.8.dfsg/src/audio/audio_encoder.h 2006-05-13 09:25:02.000000000 +0100
+++++ twinkle-0.8.dfsg.new/src/audio/audio_encoder.h 2006-07-06 23:11:33.000000000 +0100
+@@ -25,7 +25,7 @@
+ #include "twinkle_config.h"
+ #include "audio_codecs.h"
+ #include "user.h"
+-#include "gsm/inc/gsm.h"
++#include <gsm.h>
-
++
+ #ifdef HAVE_SPEEX
+ #include <speex/speex.h>
-
- diff -Nur twinkle-0.7/src/audio/audio_rx.h twinkle-0.7.new/src/audio/audio_rx.h
- --- twinkle-0.7/src/audio/audio_rx.h 2006-04-16 20:57:15.000000000 +0100
- +++ twinkle-0.7.new/src/audio/audio_rx.h 2006-05-01 22:19:25.000000000 +0100
++diff -Nur twinkle-0.8.dfsg/src/audio/audio_rx.h twinkle-0.8.dfsg.new/src/audio/audio_rx.h
++--- twinkle-0.8.dfsg/src/audio/audio_rx.h 2006-05-13 08:50:14.000000000 +0100
+++++ twinkle-0.8.dfsg.new/src/audio/audio_rx.h 2006-07-06 23:11:33.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <assert.h>
+ #include <queue>
+ #include <string>
++#include <gsm.h>
+ #include "audio_codecs.h"
+ #include "audio_device.h"
+ #include "audio_encoder.h"
-
- diff -ur orig/twinkle-0.6.1/src/audio/Makefile.am twinkle-0.6.1/src/audio/Makefile.am
- --- orig/twinkle-0.6.1/src/audio/Makefile.am 2005-10-09 20:11:36.000000000 +0100
- +++ twinkle-0.6.1/src/audio/Makefile.am 2006-02-21 10:35:37.000000000 +0000
- @@ -29,6 +29,4 @@
- tone_gen.h\
- twinkle_rtp_session.h
-
- -SUBDIRS = gsm
- -
- EXTRA_DIST = README_G711
- diff -ur orig/twinkle-0.6.1/src/gui/twinkle.pro twinkle-0.6.1/src/gui/twinkle.pro
- --- orig/twinkle-0.6.1/src/gui/twinkle.pro 2006-02-11 08:34:27.000000000 +0000
- +++ twinkle-0.6.1/src/gui/twinkle.pro 2006-02-21 11:05:20.000000000 +0000
++diff -Nur twinkle-0.8.dfsg/src/gui/twinkle.pro twinkle-0.8.dfsg.new/src/gui/twinkle.pro
++--- twinkle-0.8.dfsg/src/gui/twinkle.pro 2006-07-01 08:19:17.000000000 +0100
+++++ twinkle-0.8.dfsg.new/src/gui/twinkle.pro 2006-07-06 23:11:33.000000000 +0100
+@@ -3,7 +3,7 @@
+
+ CONFIG += qt warn_off release thread
+
- -LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile
- +LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lgsm
++-LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audio/ilbc/libilbc.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex
+++LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -lgsm
+
+ DEFINES += QT_NO_STL
+
- Only in twinkle-0.6.1/src/gui: .ui
- diff -ur orig/twinkle-0.6.1/src/Makefile.am twinkle-0.6.1/src/Makefile.am
- --- orig/twinkle-0.6.1/src/Makefile.am 2006-02-03 22:28:58.000000000 +0000
- +++ twinkle-0.6.1/src/Makefile.am 2006-02-21 10:40:53.000000000 +0000
- @@ -16,11 +16,11 @@
- $(top_builddir)/src/sockets/libsocket.a\
- $(top_builddir)/src/threads/libthread.a\
- $(top_builddir)/src/audio/libaudio.a\
- - $(top_builddir)/src/audio/gsm/libgsm.a\
- $(top_builddir)/src/audits/libaudits.a\
- $(top_builddir)/src/stun/libstun.a\
- $(CCRTP_LIBS)\
- -lresolv\
- + -lgsm\
- -lsndfile
-
- libtwinkle_a_SOURCES =\
diff --cc debian/rules
index eabbde2,0000000..e0ee8bf
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,33 -1,0 +1,36 @@@
+#!/usr/bin/make -f
+# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
+# This file is public domain.
+
+# Add here any variable or target overrides you need
+
++
+export QTDIR=/usr/share/qt3
+
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+ | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+
+FILENAME := twinkle_$(UPVERSION).orig.tar.gz
+URL := http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-$(UPVERSION).tar.gz
+
+-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
++
+install/twinkle::
+ cp debian/twinkle.desktop $(CURDIR)/debian/twinkle/usr/share/applications
+ cp debian/sip.protocol $(CURDIR)/debian/twinkle/usr/share/services
+
+print-version:
+ @@echo "Debian version: $(DEBVERSION)"
+ @@echo "Upstream version: $(UPVERSION)"
+
+get-orig-source:
+ @@dh_testdir
+ @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+ @@echo Downloading $(FILENAME) from $(URL) ...
+ @@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+
--
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