[Pkg-voip-commits] [twinkle] 16/73: Imported Debian patch 0.7-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 85206117e9fac0cbdc6349072101799573b5f3f4
Merge: 5d8925e 2abe941
Author: Mark Purcell <msp at debian.org>
Date: Mon May 1 12:21:03 2006 +0100
Imported Debian patch 0.7-1
ChangeLog | 48 +-
NEWS | 48 +-
acinclude.m4 | 5948 ++++++++++++++++++++++++++++++++
aclocal.m4 | 58 -
configure | 385 ++-
configure.in | 24 +-
debian/changelog | 14 +
debian/control | 2 +-
debian/dirs | 1 +
debian/patches/libgsm.diff | 39 +-
debian/rules | 26 +-
debian/twinkle.desktop | 11 +
src/audio/Makefile.am | 6 +
src/audio/Makefile.in | 19 +-
src/audio/audio_codecs.cpp | 56 +
src/audio/audio_codecs.h | 31 +-
src/audio/audio_device.cpp | 23 +-
src/audio/audio_device.h | 10 +-
src/audio/audio_encoder.cpp | 222 ++
src/audio/audio_encoder.h | 122 +
src/audio/audio_rx.cpp | 461 ++-
src/audio/audio_rx.h | 70 +-
src/audio/audio_session.cpp | 52 +-
src/audio/audio_session.h | 12 +-
src/audio/audio_tx.cpp | 410 ++-
src/audio/audio_tx.h | 42 +-
src/audio/dtmf_player.cpp | 183 +
src/audio/dtmf_player.h | 98 +
src/audio/freq_gen.cpp | 134 +
src/{cmd_socket.h => audio/freq_gen.h} | 35 +-
src/auth.cpp | 14 +-
src/auth.h | 10 +-
src/call_history.cpp | 29 +-
src/call_history.h | 12 +-
src/call_script.cpp | 5 +
src/call_script.h | 1 +
src/cmd_socket.cpp | 94 +-
src/cmd_socket.h | 5 +-
src/dialog.cpp | 107 +-
src/dialog.h | 7 +-
src/gui/Makefile | 23 +-
src/gui/authenticationform.ui.h | 3 +
src/gui/freedesksystray.cpp | 5 -
src/gui/freedesksystray.h | 12 -
src/gui/getaddressform.ui | 55 +-
src/gui/getaddressform.ui.h | 50 +-
src/gui/gui.cpp | 495 ++-
src/gui/gui.h | 43 +-
src/{cmd_socket.h => gui/gui_util.cpp} | 22 +-
src/{cmd_socket.h => gui/gui_util.h} | 16 +-
src/gui/images/1downarrow.png | Bin 0 -> 579 bytes
src/gui/images/1leftarrow.png | Bin 0 -> 614 bytes
src/gui/images/1uparrow.png | Bin 0 -> 586 bytes
src/gui/main.cpp | 116 +-
src/gui/mphoneform.ui | 3 +
src/gui/mphoneform.ui.h | 125 +-
src/gui/redirectform.ui | 2 +-
src/gui/redirectform.ui.h | 12 +-
src/gui/termcapform.ui | 2 +-
src/gui/termcapform.ui.h | 16 +-
src/gui/transferform.ui | 2 +-
src/gui/transferform.ui.h | 3 +-
src/gui/twinkle.pro | 11 +-
src/gui/userprofileform.ui | 973 ++++--
src/gui/userprofileform.ui.h | 274 +-
src/line.cpp | 17 +-
src/line.h | 10 +-
src/parser/parameter.cpp | 21 +
src/parser/parameter.h | 6 +
src/parser/parse_ctrl.cpp | 20 +
src/parser/parse_ctrl.h | 4 +
src/phone.cpp | 86 +-
src/phone.h | 7 +-
src/phone_user.cpp | 11 +-
src/phone_user.h | 2 +-
src/sdp/sdp.cpp | 160 +-
src/sdp/sdp.h | 39 +-
src/sender.cpp | 3 +-
src/session.cpp | 230 +-
src/session.h | 30 +-
src/sockets/url.cpp | 38 +-
src/sockets/url.h | 12 +-
src/sys_settings.cpp | 4 +
src/timekeeper.cpp | 4 +-
src/twinkle_config.h.in | 3 +
src/user.cpp | 177 +-
src/user.h | 53 +-
src/userintf.cpp | 660 +++-
src/userintf.h | 60 +-
src/util.cpp | 107 +
src/util.h | 15 +
twinkle.spec.in | 4 +
92 files changed, 11367 insertions(+), 1553 deletions(-)
diff --cc debian/changelog
index 4f11018,0000000..fc64fda
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,149 -1,0 +1,163 @@@
++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 0aae880,0000000..0e47b82
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,43 -1,0 +1,43 @@@
+Source: twinkle
+Section: comm
+Priority: optional
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
- Build-Depends: debhelper (>= 4.0.0), autotools-dev, libcommoncpp2-dev (>=1.3.10-4), libccrtp-dev (>=1.3.4), help2man, libqt3-mt-dev (>= 3:3.3.4-4), qt3-apps-dev, automake1.9, libxml2-dev, cdbs, kdelibs-bin, kdelibs4-dev, libasound2-dev [!kfreebsd-i386], libxml2-dev, libgsm1-dev, libsndfile1-dev, libxpm-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 !kfreebsd-amd64 !hurd-i386], libxml2-dev, libgsm1-dev, libsndfile1-dev, libxpm-dev, libspeex-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/dirs
index e772481,0000000..8fa061d
mode 100644,000000..100644
--- a/debian/dirs
+++ b/debian/dirs
@@@ -1,1 -1,0 +1,2 @@@
+usr/bin
++usr/share/applications
diff --cc debian/patches/libgsm.diff
index 2bb5eb7,0000000..6d03dd5
mode 100644,000000..100644
--- a/debian/patches/libgsm.diff
+++ b/debian/patches/libgsm.diff
@@@ -1,79 -1,0 +1,80 @@@
+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
+ ])
+
++# 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
+
- diff -ur orig/twinkle-0.6.1/src/audio/audio_rx.h twinkle-0.6.1/src/audio/audio_rx.h
- --- orig/twinkle-0.6.1/src/audio/audio_rx.h 2006-01-01 15:38:04.000000000 +0000
- +++ twinkle-0.6.1/src/audio/audio_rx.h 2006-02-21 10:34:57.000000000 +0000
- @@ -29,7 +29,7 @@
++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
++@@ -25,7 +25,7 @@
++ #include "twinkle_config.h"
++ #include "audio_codecs.h"
+ #include "user.h"
- #include "threads/mutex.h"
- #include "threads/sema.h"
+-#include "gsm/inc/gsm.h"
++#include <gsm.h>
- #include "audio_device.h"
- #include "twinkle_rtp_session.h"
-
- diff -ur orig/twinkle-0.6.1/src/audio/audio_tx.h twinkle-0.6.1/src/audio/audio_tx.h
- --- orig/twinkle-0.6.1/src/audio/audio_tx.h 2006-01-01 15:38:04.000000000 +0000
- +++ twinkle-0.6.1/src/audio/audio_tx.h 2006-02-21 10:35:16.000000000 +0000
- @@ -27,7 +27,7 @@
- #include "media_buffer.h"
- #include "rtp_telephone_event.h"
- #include "threads/mutex.h"
- -#include "gsm/inc/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
++@@ -24,6 +24,7 @@
++ #include <assert.h>
++ #include <queue>
++ #include <string>
++#include <gsm.h>
++ #include "audio_codecs.h"
+ #include "audio_device.h"
- #include "twinkle_rtp_session.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
+@@ -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
+
+ 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 5185fd7,0000000..c3d20c8
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,12 -1,0 +1,32 @@@
+#!/usr/bin/make -f
+# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
+# This file is public domain.
+
+# Add here any variable or target overrides you need
+
+export QTDIR=/usr/share/qt3
+
- include /usr/share/cdbs/1/class/autotools.mk
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/rules/simple-patchsys.mk
++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
++
++install/twinkle::
++ cp debian/twinkle.desktop $(CURDIR)/debian/twinkle/usr/share/applications
++
++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)
+
diff --cc debian/twinkle.desktop
index 0000000,0000000..6173198
new file mode 100644
--- /dev/null
+++ b/debian/twinkle.desktop
@@@ -1,0 -1,0 +1,11 @@@
++[Desktop Entry]
++Encoding=UTF-8
++Name=Twinkle
++Comment=VOIP softphone
++Exec=twinkle
++Icon=/usr/share/twinkle/twinkle48.png
++StartupNotify=true
++Terminal=false
++Type=Application
++Categories=Qt;KDE;Network;
++GenericName=VoIP softphone
--
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