[Pkg-voip-commits] [twinkle] 24/73: Imported Debian patch 1:0.9-4
Peter Colberg
pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:47 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 b49a79cbd9d0685de76f73e9826aea236ead2d25
Author: Mark Purcell <msp at debian.org>
Date: Sat Nov 4 13:17:50 2006 +0000
Imported Debian patch 1:0.9-4
---
debian/changelog | 9 ++++
debian/patches/dtmf.patch | 40 ++++++++++++++++
debian/patches/invite4xx.patch | 16 +++++++
debian/rules | 4 ++
debian/twinkle.1 | 102 +++++++++++++++++++++++++++++++++++++++++
5 files changed, 171 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index cc6dc43..dba3b87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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 <msp at debian.org> Sat, 4 Nov 2006 13:17:50 +0000
+
twinkle (1:0.9-3) unstable; urgency=low
* Rebuild
diff --git a/debian/patches/dtmf.patch b/debian/patches/dtmf.patch
new file mode 100644
index 0000000..e637021
--- /dev/null
+++ b/debian/patches/dtmf.patch
@@ -0,0 +1,40 @@
+Index: src/session.cpp
+===================================================================
+--- src/session.cpp (revision 223)
++++ src/session.cpp (working copy)
+@@ -653,18 +653,19 @@
+ case DTMF_AUTO:
+ case DTMF_INBAND:
+ get_line()->ci_set_dtmf_supported(true, true);
++ ui->cb_dtmf_supported(get_line()->get_line_number());
+ break;
+ case DTMF_RFC2833:
+ get_line()->ci_set_dtmf_supported(false);
++ ui->cb_dtmf_not_supported(get_line()->get_line_number());
+ break;
+ case DTMF_INFO:
+ get_line()->ci_set_dtmf_supported(true, false, true);
++ ui->cb_dtmf_supported(get_line()->get_line_number());
+ break;
+ default:
+ assert(false);
+ }
+-
+- ui->cb_line_state_changed();
+ }
+
+ audio_rtp_session->run();
+@@ -675,10 +676,10 @@
+ MEMMAN_DELETE(audio_rtp_session);
+ delete audio_rtp_session;
+ audio_rtp_session = NULL;
++
++ get_line()->ci_set_dtmf_supported(false);
++ ui->cb_line_state_changed();
+ }
+-
+- get_line()->ci_set_dtmf_supported(false);
+- ui->cb_line_state_changed();
+ }
+
+ t_audio_session *t_session::get_audio_session(void) const {
diff --git a/debian/patches/invite4xx.patch b/debian/patches/invite4xx.patch
new file mode 100644
index 0000000..e9d1535
--- /dev/null
+++ b/debian/patches/invite4xx.patch
@@ -0,0 +1,16 @@
+Index: src/line.cpp
+===================================================================
+--- src/line.cpp (revision 225)
++++ src/line.cpp (working copy)
+@@ -966,9 +966,8 @@
+ } else {
+ d->recvd_response(r, tuid, tid);
+ }
+- }
+-
+- if (r->hdr_cseq.method == INVITE) {
++ } else {
++ d->recvd_response(r, tuid, tid);
+ pending_dialogs.remove(d);
+ MEMMAN_DELETE(d);
+ delete d;
diff --git a/debian/rules b/debian/rules
index 0210a70..c01a411 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,8 @@ URL := http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-$(UPVERSION).tar.g
DEB_CONFIGURE_EXTRA_FLAGS := --without-ilbc
+DEB_INSTALL_MANPAGES_twinkle = debian/twinkle.1
+
install/twinkle::
cp twinkle.desktop $(CURDIR)/debian/twinkle/usr/share/applications
cp sip.protocol $(CURDIR)/debian/twinkle/usr/share/services
@@ -34,3 +36,5 @@ get-orig-source:
@@echo Downloading $(FILENAME) from $(URL) ...
@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+help2man:
+ help2man twinkle -N -n 'Voice over Internet Protocol (VoIP) SIP Phone' -o debian/twinkle.1
diff --git a/debian/twinkle.1 b/debian/twinkle.1
new file mode 100644
index 0000000..530433a
--- /dev/null
+++ b/debian/twinkle.1
@@ -0,0 +1,102 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH TWINKLE "1" "November 2006" "Twinkle 0.9 - October 1 2006" "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 <dir>
+Set the share directory.
+.TP
+\fB\-f\fR <profile>
+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\-i\fR <IP addr>
+If you have multiple IP addresses on your computer,
+then you can supply the IP address to use here.
+.TP
+\fB\-\-nic\fR <NIC>
+If you have multiple NICs on your computer,
+then you can supply the NIC name to use here (e.g. eth0).
+.HP
+\fB\-\-call\fR <address>
+.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=<subject>'
+to the address.
+.IP
+Examples:
+twinkle \fB\-\-call\fR 123456
+twinkle \fB\-\-call\fR sip:example at example.com?subject=hello
+.HP
+\fB\-\-cmd\fR <cli command>
+.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'
+.HP
+\fB\-\-immediate\fR
+.IP
+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 <profile>
+.IP
+Make <profile> 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.
+.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-2006 Michel de Boer
+http://www.twinklephone.com
+.PP
+Built with support for: ALSA, KDE, Speex, ZRTP
+.PP
+Contributions:
+* ALSA \- Rickard Petzall
+* ZRTP/SRTP \- Werner Dittmann
+.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.
--
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