[Pkg-voip-commits] r1235 - in ohphone/trunk/debian: . patches
Kilian Krause
kilian at costa.debian.org
Sat Feb 4 16:24:21 UTC 2006
Author: kilian
Date: 2006-02-04 16:24:20 +0000 (Sat, 04 Feb 2006)
New Revision: 1235
Removed:
ohphone/trunk/debian/patches/02_main.cxx.dpatch
ohphone/trunk/debian/patches/03_ohphone.1.dpatch
Modified:
ohphone/trunk/debian/changelog
ohphone/trunk/debian/control
ohphone/trunk/debian/patches/00list
Log:
patches have been incorporated upsteam. no need to have them in Debian anymore.
Modified: ohphone/trunk/debian/changelog
===================================================================
--- ohphone/trunk/debian/changelog 2006-02-04 15:04:01 UTC (rev 1234)
+++ ohphone/trunk/debian/changelog 2006-02-04 16:24:20 UTC (rev 1235)
@@ -1,3 +1,9 @@
+ohphone (1:1.4.5+20060204-1) UNRELEASED; urgency=low
+
+ * Made compilation work with Phobos and Atlas versions.
+
+ -- Kilian Krause <kilian at debian.org> Thu, 2 Feb 2006 23:58:58 +0100
+
ohphone (1:1.4.3+20050304-7) unstable; urgency=low
* Fix building with sudo rather than fakeroot. Same fix as for pstngw.
Modified: ohphone/trunk/debian/control
===================================================================
--- ohphone/trunk/debian/control 2006-02-04 15:04:01 UTC (rev 1234)
+++ ohphone/trunk/debian/control 2006-02-04 16:24:20 UTC (rev 1235)
@@ -3,7 +3,7 @@
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), libpt-dev (>=1.8.7-2), libopenh323-dev (>=1.15.6-2), libsdl-dev, svgalibg1-dev [i386], g++ (>=2:3.2), dpatch (>= 2.0.10), libx11-dev, libxext-dev, x-dev
+Build-Depends: debhelper (>=4.0.0), libpt-dev (>=1.9.2), libopenh323-dev (>=1.17.3), libsdl-dev, svgalibg1-dev [i386], g++ (>=2:3.2), dpatch (>= 2.0.10), libx11-dev, libxext-dev, x-dev
Standards-Version: 3.6.2
Package: ohphone
Modified: ohphone/trunk/debian/patches/00list
===================================================================
--- ohphone/trunk/debian/patches/00list 2006-02-04 15:04:01 UTC (rev 1234)
+++ ohphone/trunk/debian/patches/00list 2006-02-04 16:24:20 UTC (rev 1235)
@@ -1,3 +1 @@
01_Makefile.dpatch
-02_main.cxx.dpatch
-03_ohphone.1.dpatch
Deleted: ohphone/trunk/debian/patches/02_main.cxx.dpatch
===================================================================
--- ohphone/trunk/debian/patches/02_main.cxx.dpatch 2006-02-04 15:04:01 UTC (rev 1234)
+++ ohphone/trunk/debian/patches/02_main.cxx.dpatch 2006-02-04 16:24:20 UTC (rev 1235)
@@ -1,44 +0,0 @@
-#! /bin/sh -e
-## 02_main.cxx.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removes some options that are not compiled in Debian package
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-
---- ohphone-1.4.1.orig/main.cxx
-+++ ohphone-1.4.1/main.cxx
-@@ -843,7 +843,6 @@
- #endif
- #ifdef P_SDL
- " : sdl Use Simple DirectMedia Library\n"
-- " --videopip : Local video is displayed in adjacent smaller window\n"
- #endif
- #ifdef HAS_X11
- " : x11 automatically pick best X11 mode\n"
-@@ -908,7 +907,6 @@
- #ifdef G729
- " --g729 : Set G.729 as preferred codec\n"
- #endif
-- " --g7231 : Set G.723.1 as preferred codec\n"
- " -I --input-mode mode : Set the mode for sending User Input Indications (DTMF)\n"
- " can be string, signal, q931 or rfc2833 (default is string)\n"
- " -U --user-input-cap mode : Set the mode for User Input Capabilities\n"
Deleted: ohphone/trunk/debian/patches/03_ohphone.1.dpatch
===================================================================
--- ohphone/trunk/debian/patches/03_ohphone.1.dpatch 2006-02-04 15:04:01 UTC (rev 1234)
+++ ohphone/trunk/debian/patches/03_ohphone.1.dpatch 2006-02-04 16:24:20 UTC (rev 1235)
@@ -1,285 +0,0 @@
-#! /bin/sh -e
-## 03_ohphone.1.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes different typos in manpage
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-
---- ohphone-1.4.1.orig/ohphone.1
-+++ ohphone-1.4.1/ohphone.1
-@@ -1,8 +1,9 @@
- '\" t
- .\" Man page for ohphone
- .\" CRS 29 May 2000
-+.\" Santiago Garcia Mantinan (manty) 18 Jul 2001
- .\"
--.TH ohphone 1 "29 May 2000"
-+.TH ohphone 1 "18 Jul 2001"
- .LO 1
- .SH NAME
- ohphone \- initiate, or receive, a H.323 IP telephony call
-@@ -40,22 +41,46 @@
- Automatically answer incoming calls.
-
- .TP
-+\fB\-\-aec\fR \fIlevel\fR
-+Set the AEC (audio echo cancellation) level when using a Quicknet card.
-+\fIlevel\fR must be in the range 0 through 3. The default value is 2.
-+
-+.TP
- \fB\-\-autohook\fR
- Automatically handle hook state for phone devices that appear permanently off-hook.
- This option is intended for use with the Quicknet PhoneCARD.
-
- .TP
--\fB\-\-aec\fR, \fIlevel\fR
--Set the AEC (audio echo cancellation) level when using a Quicknet card.
--\fIlevel\fR must be in the range 0 through 3. The default value is 2.
-+\fB\-\-answer\-timeout\fR \fItime\fR
-+Time in seconds till forward on no answer.
-
- .TP
--\fB\-b\fR, \fB\-\-bandwidth\fR bps\fR
-+\fB\-b\fR, \fB\-\-bandwidth\fR \fIbps\fR
- Limit bandwidth usage reported to gatekeeper to \fIbps\fR bits/second.
-
- .TP
--\fB\--callerid\fR
--Enable transmission of caller ID to phone handset
-+\fB\-c\fR, \fB\-\-callerid\fR
-+Enable caller id display.
-+
-+.TP
-+\fB\-\-calleridcw\fR
-+Enable caller id on call waiting display.
-+
-+.TP
-+\fB\-\-connectport\fR \fIport\fR
-+Port to connect to for outgoing connections (default 1720).
-+
-+.TP
-+\fB\-\-connectring\fR \fInum\fR
-+Distinctive ring number to send to remote: 0 (default) to 7.
-+
-+.TP
-+\fB\-C\fR \fB\-\-country\fR \fIname\fR
-+Set the country code for Quicknet device.
-+
-+.TP
-+\fB\-D\fR, \fB\-\-disable\fR \fIcodec\fR
-+Disable the specified \fIcodec\fR (may be used multiple times).
-
- .TP
- \fB\-d\fR, \fB\-\-autodial\fR \fIhost\fR
-@@ -77,16 +102,37 @@
- Disable silence detection and removal for GSM and software G.711.
-
- .TP
-+\fB\-F\fR, \fB\-\-forward\-always\fR \fIparty\fR
-+Forward all calls to the remote specified \fIparty\fR.
-+
-+.TP
-+\fB\-B\fR, \fB\-\-forward\-busy\fR \fIparty\fR
-+Forward to the remote specified \fIparty\fR if busy.
-+
-+.TP
-+\fB\-N\fR, \fB\-\-forward\-no\-answer\fR \fIparty\fR
-+Forward to the remote specified \fIparty\fR on no answer. Timeout for no
-+answer set with --answer-timeout.
-+
-+.TP
- \fB\-f\fR, \fB\-\-fast\-disable\fR
- Do not request H323V2 FastConnect when initiaiting a connection.
-
- .TP
--\fB\-h\fR, \fB\-\-h245tunnel\-disable\fR
-+\fB\-h\fR, \fB\-\-help\fR
-+Show help message.
-+
-+.TP
-+\fB\-T\fR, \fB\-\-h245tunnel\-disable\fR
- Do not perform H245 tunneling when initiating a connection.
-
- .TP
- \fB\-g\fR, \fB\-\-gatekeeper\fR \fIhost\fR
--Upon startup, register with only with the specified gatekeeper rather than attempting to find a gatekeeper by using UDP broadcast.
-+Upon startup, register only with the specified gatekeeper rather than attempting to find a gatekeeper by using UDP broadcast.
-+
-+.TP
-+\fB\-G\fR, \fB\-\-gatekeeper\-id\fR \fIname\fR
-+Specify gatekeeper by ID.
-
- .TP
- \fB\-\-g711\-ulaw\fR
-@@ -97,14 +143,26 @@
- Set G.711 ALaw as preferred codec.
-
- .TP
-+\fB\-\-g711frames\fR \fIcount\fR
-+Set the number G.711 frames in capabilities (default 30).
-+
-+.TP
- \fB\-\-g7231\fR
- Set G.723.1 as preferred codec, when using a Quicknet card.
-
- .TP
-+\fB\-\-g728\fR
-+Set G.728 as preferred codec.
-+
-+.TP
- \fB\-\-gsm\fR
- Use GSM 06.10 as preferred codec.
-
- .TP
-+\fB\-\-gsmframes\fR \fIcount\fR
-+Set the number GSM frames in capabilities (default 4).
-+
-+.TP
- \fB\-\-h261\fR \fIdevice\fR
- This option has been deprecated in favour of the videoreceive and videotransmit options
-
-@@ -119,7 +177,7 @@
- on the same multi\-homed machine, or for ensuring that only calls from the external, or internal, network will be received on a particular handset.
-
- .TP
--\fB\-j\fR, \fB\-\-jitter\fR delay\fR
-+\fB\-j\fR, \fB\-\-jitter\fR \fIdelay\fR
- Set jitter buffer to \fIdelay\fR ms. By default, the jitter buffer is set to 50 ms.
-
- .TP
-@@ -127,12 +185,23 @@
- Listen for incoming calls.
-
- .TP
-+\fB\-\-listenport\fR \fIport\fR
-+Listen on the specified tcp \fIport\fR instead of the default 1720.
-+
-+.TP
- \fB\-n\fR, \fB\-\-no\-gatekeeper\fR
--Do not attempt to find a gatetkeeper upon startup using UDP broadcast.
-+Do not attempt to find a gatekeeper upon startup using UDP broadcast.
-
- .TP
- \fB\-o\fR, \fB\-\-output\fR \fIfilename\fR
--Write trace output (enabled with the \fB\-t\fR option) to the specified file rather than to stdout.
-+Write trace output (enabled with the \fB\-t\fR option) to the specified file
-+rather than to stderr.
-+
-+.TP
-+\fB\-P\fR, \fB\-\-prefer\fR \fIcodec\fR
-+Sets the prefered codec to the specified \fIcodec\fR. If used multiple
-+times, it specifies an order in preference, being the first one specified
-+the most prefered one.
-
- .TP
- \fB\-p\fR, \fB\-\-proxy\fR \fIhost\fR
-@@ -171,15 +240,27 @@
- If the \-\-ringfile option is specified, this option defines how many to delay between playing each ring. If the delay is specified as -1, then the file is only played once. If it is zero, then the file loops continuously with no delay. The default delay is 5 seconds.
-
- .TP
--\fB\-s\fR, \fB\-\-sound\fR device\fR
-+\fB\-\-save\fR
-+Save arguments in configuration file.
-+
-+.TP
-+\fB\-\-setup\-param\fR \fIstring\fR
-+Arbitrary data to be put into H.225 Setup PDU.
-+
-+.TP
-+\fB\-s\fR, \fB\-\-sound\fR \fIdevice\fR
- Select the sound input and output device. The default value is /dev/dsp0.
-
- .TP
--\fB\-\-sound-mixer\fR device\fR
-+\fB\-\-sound\-buffers\fR \fIn\fR
-+Set sound buffer depth (default=2)
-+
-+.TP
-+\fB\-\-sound-mixer\fR \fIdevice\fR
- Select the sound card mixer device. The default value is /dev/mixer0
-
- .TP
--\fB\-\-sound-recchan\fR device\fR
-+\fB\-\-sound-recchan\fR \fIdevice\fR
- Select the sound card record channel. By default, the mic channel is used.
-
- .TP
-@@ -191,7 +272,7 @@
- Set the playback volume when a sound card is used. This overrides the value of \-\-playvol (if set). The volume is an integer value from 0 through 100
-
- .TP
--\fB\-\-sound-recol\fR \fIvol\fR
-+\fB\-\-sound-recvol\fR \fIvol\fR
- Set the record volume when a sound card is used. This overrides the value of \-\-recvol (if set). The volume is an integer value from 0 through 100
-
- .TP
-@@ -199,18 +280,31 @@
- Enable debug tracing, which displays messages at run\-time to assist in debugging or problem identification.
- Specifying this option multiple time increases the amount of information displayed.
- .B ohphone
--has trace statements up to level 5. Use the \fB\-o\fR option to write the trace information to a file rather than to stdout.
-+has trace statements up to level 5. Use the \fB\-o\fR option to write the
-+trace information to a file rather than to stderr.
-
- .TP
--\fB\-\-tos \fR value\fR
-+\fB\-\-tos\fR \fIvalue\fR
- Set the Type Of Service in outgoing RTP packets to the specified value.
-
- .TP
--\fB\-u\fR, \fB\-\-user\fR name\fR
-+\fB\-u\fR, \fB\-\-user\fR \fIname\fR
- Set local endpoint alias name. Can be used multiple times to add multiple aliases.
- By default, the alias list contains a single entry with the current user's login name.
-
- .TP
-+\fB\-v\fR, \fB\-\-verbose\fR \fIn\fR
-+Set amount of information displayed (0=none).
-+
-+.TP
-+\fB\-\-videodevice\fR \fIdev\fR
-+Select video capture device (default /dev/video0).
-+
-+\fB\-\-videofill\fR \fIn\fR
-+Set the number of updated background blocks per frame to \fIn\fR, default is
-+2. \fIn\fR has to be between 2 and 99.
-+
-+.TP
- \fB\-\-videoformat\fR \fIformat\fR
- Set the video capture format. \fIformat\fR must be the string \fIpal\fR (default) or \fIntsc\fR
-
-@@ -268,6 +362,15 @@
- The video format used is determined by the \-\-videoformat option.
- If \-\-videolocal is specified, then the local video signal will be displayed in a seperate window.
-
-+.TP
-+\fB\-\-videotxfps\fR \fIn\fR
-+Set maximum number of transmited video frames per seceond to \fIn\fR,
-+default is 10. \fIn\fR has to be between 2 and 30.
-+
-+.TP
-+\fB\-\-videotxquality\fR \fIn\fR
-+Select sent video quality, defaults to 9. 1(good)<=n<=31
-+
- .SH CONFIGURATION FILE
- .PP
- .B ohphone
More information about the Pkg-voip-commits
mailing list