Patch to isdnlog manpages by Matthias Klose <doko@cs.tu-berlin.de>,
a maintainer of Debian's isdnutils source package: - add manpage for isdnbill *) - fix typo in isdnrate.man - isdnbill.c: add english help texts -- *) Renamed the sourcefile isdnrep/isdnbill.man to isdnrep/isdnbill.1.in because only @MANDATE@ is replaced in %.man files. Other @VARS@ have to be processed by config.status and therefore noted in configure.in and configure. The isdnrep manpage was used as template for those entries.
This commit is contained in:
Tobias Becker
parent
75efbfb2c8
commit
a48bbbb211
|
|
@ -19,6 +19,21 @@
|
|||
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
##
|
||||
## $Log$
|
||||
## Revision 1.212 2004/02/12 23:52:28 tobiasb
|
||||
## isdnlog-4.68:
|
||||
## - New German ratefile, rate-de.dat version 3.08 from rates4linux,
|
||||
## included rates have been reviewed in January 2004 or later.
|
||||
## - New setting for parameterfile: closefds=yes
|
||||
## See isdnlog(8) or isdnlog/start_prog.c for details.
|
||||
## - Changes checked in earlier but after step to isdnlog-4.67:
|
||||
## - Added Belgian area codes.
|
||||
## - Supported database are shown at isdnlog's startup.
|
||||
## - isdnlog now tries to reconnect to a mysql server if necessary.
|
||||
## - Fixed SIGSEGV in isdnrep with missing zonenames in ratefile.
|
||||
## - New options -c and -i for isdnrate.
|
||||
## - Some small fixes for redirs in ratefiles.
|
||||
## - Disabled unicode for filehandles in Perl scripts.
|
||||
##
|
||||
## Revision 1.211 2003/10/29 17:41:33 tobiasb
|
||||
## isdnlog-4.67:
|
||||
## - Enhancements for isdnrep:
|
||||
|
|
@ -1661,7 +1676,8 @@ endif
|
|||
MANPAGES = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \
|
||||
isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \
|
||||
isdnlog/isdnlog.users.5 isdnrep/isdnrep.1 isdnconf/isdnconf.1 \
|
||||
tools/isdnrate.1 tools/rate-files.5
|
||||
tools/isdnrate.1 tools/rate-files.5 \
|
||||
isdnrep/isdnbill.1
|
||||
|
||||
ifeq ($(POSTGRES),1)
|
||||
DEFS += -DPOSTGRES
|
||||
|
|
@ -1963,6 +1979,7 @@ install-progs:
|
|||
install-data:
|
||||
$(INSTALL_DATA) isdnlog/isdnlog.8 $(DESTDIR)$(MAN8DIR)/isdnlog$(MAN8EXT)
|
||||
$(INSTALL_DATA) isdnrep/isdnrep.1 $(DESTDIR)$(MAN1DIR)/isdnrep$(MAN1EXT)
|
||||
$(INSTALL_DATA) isdnrep/isdnbill.1 $(DESTDIR)$(MAN1DIR)/isdnbill$(MAN1EXT)
|
||||
$(INSTALL_DATA) isdnconf/isdnconf.1 $(DESTDIR)$(MAN1DIR)/isdnconf$(MAN1EXT)
|
||||
$(INSTALL_DATA) isdnlog/callerid.conf.5 $(DESTDIR)$(MAN5DIR)/callerid.conf$(MAN5EXT)
|
||||
$(INSTALL_DATA) isdnlog/isdnlog.5 $(DESTDIR)$(MAN5DIR)/isdnlog$(MAN5EXT)
|
||||
|
|
|
|||
|
|
@ -1253,6 +1253,7 @@ MANDATE_ISDNLOG5=`grep CHECKIN isdnlog/isdnlog.5.in | awk '{print $4}'`
|
|||
MANDATE_ISDNLOG8=`grep CHECKIN isdnlog/isdnlog.8.in | awk '{print $4}'`
|
||||
MANDATE_ISDNLOG_USERS=`grep CHECKIN isdnlog/isdnlog.users.5.in | awk '{print $4}'`
|
||||
MANDATE_ISDNREP=`grep CHECKIN isdnrep/isdnrep.1.in | awk '{print $4}'`
|
||||
MANDATE_ISDNBILL=`grep CHECKIN isdnrep/isdnbill.1.in | awk '{print $4}'`
|
||||
MANDATE_ISDNCONF=`grep CHECKIN isdnconf/isdnconf.1.in | awk '{print $4}'`
|
||||
|
||||
if test "$CONFIG_LIB_AREACODE" = "y" ; then
|
||||
|
|
@ -4333,7 +4334,7 @@ esac
|
|||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 isdnlog/isdnlog.users.5 isdnrep/isdnrep.1 isdnconf/isdnconf.1"
|
||||
ac_config_files="$ac_config_files Makefile isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 isdnlog/isdnlog.users.5 isdnrep/isdnrep.1 isdnrep/isdnbill.1 isdnconf/isdnconf.1"
|
||||
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
|
||||
|
|
@ -4813,6 +4814,7 @@ do
|
|||
"isdnlog/isdnlog.8" ) CONFIG_FILES="$CONFIG_FILES isdnlog/isdnlog.8" ;;
|
||||
"isdnlog/isdnlog.users.5" ) CONFIG_FILES="$CONFIG_FILES isdnlog/isdnlog.users.5" ;;
|
||||
"isdnrep/isdnrep.1" ) CONFIG_FILES="$CONFIG_FILES isdnrep/isdnrep.1" ;;
|
||||
"isdnrep/isdnbill.1" ) CONFIG_FILES="$CONFIG_FILES isdnrep/isdnbill.1" ;;
|
||||
"isdnconf/isdnconf.1" ) CONFIG_FILES="$CONFIG_FILES isdnconf/isdnconf.1" ;;
|
||||
"policy.h" ) CONFIG_HEADERS="$CONFIG_HEADERS policy.h" ;;
|
||||
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
||||
|
|
@ -4947,6 +4949,7 @@ s,@MANDATE_ISDNLOG5@,$MANDATE_ISDNLOG5,;t t
|
|||
s,@MANDATE_ISDNLOG8@,$MANDATE_ISDNLOG8,;t t
|
||||
s,@MANDATE_ISDNLOG_USERS@,$MANDATE_ISDNLOG_USERS,;t t
|
||||
s,@MANDATE_ISDNREP@,$MANDATE_ISDNREP,;t t
|
||||
s,@MANDATE_ISDNBILL@,$MANDATE_ISDNBILL,;t t
|
||||
s,@MANDATE_ISDNCONF@,$MANDATE_ISDNCONF,;t t
|
||||
s,@CDBEXTRALIBS@,$CDBEXTRALIBS,;t t
|
||||
CEOF
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ MANDATE_ISDNLOG5=`grep CHECKIN isdnlog/isdnlog.5.in | awk '{print $4}'`
|
|||
MANDATE_ISDNLOG8=`grep CHECKIN isdnlog/isdnlog.8.in | awk '{print $4}'`
|
||||
MANDATE_ISDNLOG_USERS=`grep CHECKIN isdnlog/isdnlog.users.5.in | awk '{print $4}'`
|
||||
MANDATE_ISDNREP=`grep CHECKIN isdnrep/isdnrep.1.in | awk '{print $4}'`
|
||||
MANDATE_ISDNBILL=`grep CHECKIN isdnrep/isdnbill.1.in | awk '{print $4}'`
|
||||
MANDATE_ISDNCONF=`grep CHECKIN isdnconf/isdnconf.1.in | awk '{print $4}'`
|
||||
|
||||
if test "$CONFIG_LIB_AREACODE" = "y" ; then
|
||||
|
|
@ -249,6 +250,7 @@ AC_SUBST(MANDATE_ISDNLOG5)
|
|||
AC_SUBST(MANDATE_ISDNLOG8)
|
||||
AC_SUBST(MANDATE_ISDNLOG_USERS)
|
||||
AC_SUBST(MANDATE_ISDNREP)
|
||||
AC_SUBST(MANDATE_ISDNBILL)
|
||||
AC_SUBST(MANDATE_ISDNCONF)
|
||||
AC_SUBST(CDBEXTRALIBS)
|
||||
AC_OUTPUT(Makefile isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 isdnlog/isdnlog.users.5 isdnrep/isdnrep.1 isdnconf/isdnconf.1)
|
||||
AC_OUTPUT(Makefile isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 isdnlog/isdnlog.users.5 isdnrep/isdnrep.1 isdnrep/isdnbill.1 isdnconf/isdnconf.1)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,90 @@
|
|||
.\" $Id$
|
||||
.\" CHECKIN $Date$
|
||||
.\" .TH isdnbill 1 "@MANDATE_ISDNBILL@" "ISDN 4 Linux @I4LVERSION@" "Linux System Commands"
|
||||
.TH isdnbill 1 "2003-10-14" "ISDN 4 Linux @I4LVERSION@" "Linux System Commands"
|
||||
|
||||
.PD 0
|
||||
.SH NAME
|
||||
isdnbill \- report isdn costs
|
||||
|
||||
.SH DESCRIPTION
|
||||
isdnbill is a simple and imperfect utility to show the bill for ISDN calls.
|
||||
Note that it is only for indicative purposes! It works best in Germany,
|
||||
and even then there are no guarantees.
|
||||
Consider its use for educational purposes only...
|
||||
|
||||
For better results, use isdnrep.
|
||||
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
.B \-V
|
||||
show version
|
||||
|
||||
.TP
|
||||
.B \-a
|
||||
show all connections
|
||||
|
||||
.TP
|
||||
.B \-e
|
||||
show incomplete calls
|
||||
|
||||
.TP
|
||||
.B \-f
|
||||
recalculate costs _always_
|
||||
|
||||
.TP
|
||||
.B \-i
|
||||
show incoming calls
|
||||
|
||||
.TP
|
||||
.B \-m
|
||||
prices without VAT
|
||||
|
||||
.TP
|
||||
.B \-n
|
||||
do _not_ replace numbers with aliases
|
||||
|
||||
.TP
|
||||
.B \-o
|
||||
show outgoing calls
|
||||
|
||||
.TP
|
||||
.B \-t
|
||||
show only current connections
|
||||
|
||||
.TP
|
||||
.B \-vn
|
||||
verbose level n
|
||||
|
||||
.TP
|
||||
.B \-Nnnn
|
||||
show only calls with the specified number
|
||||
|
||||
.TP
|
||||
.B \-I
|
||||
show only calls on the internal S0 bus
|
||||
|
||||
.TP
|
||||
.B \-E
|
||||
show only calls on the external S0 bus
|
||||
|
||||
|
||||
.SH "FILES"
|
||||
.TP
|
||||
\fB@LOGFILE@\fR or \fB/var/lib/isdn/calls\fR
|
||||
isdnlog log file with information about all calls.
|
||||
|
||||
.TP
|
||||
\fB@I4LCONFDIR@/@CONFFILE@\fR
|
||||
general configuration
|
||||
|
||||
.TP
|
||||
\fB@I4LCONFDIR@/@CALLERIDFILE@\fR
|
||||
aliases for telephone numbers
|
||||
|
||||
.SH SEE ALSO
|
||||
.B isdnlog(5) isdnlog(8) isdnrep(1)
|
||||
|
||||
.SH AUTHOR
|
||||
This manual page was written by
|
||||
Paul Slootman <paul@debian.org>, for Debian GNU/Linux.
|
||||
|
|
@ -918,18 +918,30 @@ int main(int argc, char *argv[], char *envp[])
|
|||
if (!showincoming && !showoutgoing && !showerrors) {
|
||||
printf("This makes no sense! You must specify -i, -o or -e\n");
|
||||
printf("\t-a -> alle Verbindungen anzeigen i.e. \"-ioe\"\n");
|
||||
printf("\t -> show all connections\n");
|
||||
printf("\t-e -> nichtzustandegekommene Verbindungen anzeigen\n");
|
||||
printf("\t -> show incomplete calls\n");
|
||||
printf("\t-f -> Verbindungsentgeld _immer_ neu berechnen\n");
|
||||
printf("\t -> recalculate costs _always_\n");
|
||||
printf("\t-i -> reinkommende Verbindungen anzeigen\n");
|
||||
printf("\t -> show incoming calls\n");
|
||||
printf("\t-m -> ohne MwSt anzeigen\n");
|
||||
printf("\t -> prices without VAT\n");
|
||||
printf("\t-n -> _nicht_ anstelle Rufnummern Alias-Bezeichnungen anzeigen\n");
|
||||
printf("\t -> do _not_ replace numbers with aliases\n");
|
||||
printf("\t-o -> rausgehende Verbindungen anzeigen\n");
|
||||
printf("\t -> show outgoing calls\n");
|
||||
printf("\t-t -> nur die heutigen Verbindungen anzeigen\n");
|
||||
printf("\t -> show only current connections\n");
|
||||
printf("\t-vn -> Verbose Level\n");
|
||||
printf("\t-Nnnn -> nur Verbindungen mit _dieser_ Rufnummer anzeigen\n");
|
||||
printf("\t -> show only calls with the specified number\n");
|
||||
printf("\t-I -> nur Verbindungen am Internen S0-Bus anzeigen\n");
|
||||
printf("\t -> show only calls on the internal S0 bus\n");
|
||||
printf("\t-E -> nur Verbindungen am Externen S0-Bus anzeigen\n");
|
||||
printf("\t -> show only calls on the external S0 bus\n");
|
||||
printf("\t-V -> Version anzeigen\n");
|
||||
printf("\t -> show version\n");
|
||||
|
||||
return(1);
|
||||
} /* if */
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ Start the isdnrate daemon.
|
|||
.br
|
||||
Start the isdnrate daemon, write
|
||||
.I isdnrate.pid
|
||||
to /var/run and create thew given socket.
|
||||
to /var/run and create the given socket.
|
||||
.P
|
||||
.I isdnrate -CH -b5 -f01 -l120 Attersee
|
||||
.br
|
||||
|
|
|
|||
Loading…
Reference in New Issue