[Dbconfig-common-changes] dbconfig-common dbconfig-generate-include, 1.12, 1.13 dbconfig-generate-include.1, 1.4, 1.5 dbconfig-load-include, 1.3, 1.4 dbconfig-load-include.1, 1.2, 1.3

[seanius at haydn.debian.org]

Update of /cvsroot/dbconfig-common/dbconfig-common
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv13116

Modified Files:
	dbconfig-generate-include dbconfig-generate-include.1 
	dbconfig-load-include dbconfig-load-include.1 
Log Message:
a couple fixes from Thijs


Index: dbconfig-generate-include
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dbconfig-generate-include,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- dbconfig-generate-include	19 Nov 2005 20:33:04 -0000	1.12
+++ dbconfig-generate-include	28 Nov 2005 20:01:12 -0000	1.13
@@ -16,7 +16,7 @@
 	prog=`basename $0`
 	cat << EOF
 
-$prog $VERSION 
+$prog v$VERSION 
 copyright (c) 2005 sean finney <seanius at debian.org>
 
 EOF
@@ -25,7 +25,7 @@
 usage(){
 	version
 	cat << EOF
-usage: $prog [-hv] [-f format] [-a] [-d [varname]] [-u [varname]] [-p [varname]] [-s [varname]] [-P [varname]] [-t [varname]] [-O owner[:group]] [-m mode] [-U] infile [outfile]
+usage: $prog [-hv] [-f format] [-a] [-d[varname]] [-u[varname]] [-p[varname]] [-s[varname]] [-P[varname]] [-t[varname]] [-O owner[:group]] [-m mode] [-U] infile [outfile]
 
 	infile            use the given dbconfig-common config file as input
 	outfile           use the given file as input (default: stdout)

Index: dbconfig-generate-include.1
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dbconfig-generate-include.1,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbconfig-generate-include.1	8 Aug 2005 02:20:06 -0000	1.4
+++ dbconfig-generate-include.1	28 Nov 2005 20:01:12 -0000	1.5
@@ -3,7 +3,7 @@
 dbconfig-generate-include \- generate custom format db include files
 
 .SH SYNOPSIS
-.B dbconfig\-generate\-include [\-hv] [\-f format] [\-o options] [\-a] [\-d [varname]] [\-u [varname]] [\-p [varname]] [\-s [varname]] [\-P [varname]] [\-t [varname]] [\-O owner[:group]] [\-m mode] [\-U] infile [outfile]
+.B dbconfig\-generate\-include [\-hv] [\-f format] [\-o options] [\-a] [\-d[varname]] [\-u[varname]] [\-p[varname]] [\-s[varname]] [\-P[varname]] [\-t[varname]] [\-O owner[:group]] [\-m mode] [\-U] infile [outfile]
 .br
 .Xc
 

Index: dbconfig-load-include
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dbconfig-load-include,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dbconfig-load-include	7 Nov 2005 19:21:25 -0000	1.3
+++ dbconfig-load-include	28 Nov 2005 20:01:12 -0000	1.4
@@ -9,7 +9,7 @@
 dbtype_varname="dbtype"
 
 # the version will always be < the package version
-VERSION="1.7.1"
+VERSION="$Revision$"
 
 version(){
 	prog=`basename $0`
@@ -24,10 +24,10 @@
 usage(){
 	version
 	cat << EOF
-usage: $prog [-hv] [-a] [-d [varname]] [-u [varname]] [-p [varname]] [-s [varname]] [-P [varname]] [-t [varname]] -f format infile
+usage: $prog [-hv] [-a] [-d[varname]] [-u[varname]] [-p[varname]] [-s[varname]] [-P[varname]] [-t[varname]] -f format infile
 
 	infile            use the given dbconfig-common config file as input
-	-f|--format       use the given output format (default: sh)
+	-f|--format       use the given output format (must be specified)
 	-a|--all          include all information in output (default)
 	-d|--dbname       include the dbname in the output
 	-p|--dbpass       include the dbpass in the output
@@ -47,7 +47,7 @@
 EOF
 }
 
-TEMP=`getopt -o af:hd::p::u::s::t::P::v --long help,dbuser::,dbname::,dbpass::,dbport::,dbserver::,dbtype::,format:,version -n $0 -- "$@"`
+TEMP=`getopt -o af:hd::p::u::s::t::P::v -l help,dbuser::,dbname::,dbpass::,dbport::,dbserver::,dbtype::,format:,version -n $0 -- "$@"`
 
 if [ $? != 0 ] ; then usage >&2 ; exit 1 ; fi
 

Index: dbconfig-load-include.1
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/dbconfig-load-include.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dbconfig-load-include.1	31 Jul 2005 11:17:51 -0000	1.2
+++ dbconfig-load-include.1	28 Nov 2005 20:01:12 -0000	1.3
@@ -3,7 +3,7 @@
 dbconfig\-load\-include \- parse custom format db config files
 
 .SH "SYNOPSIS"
-.B dbconfig\-load\-include [\-hv] [\-a] [\-d [varname]] [\-u [varname]] [\-p [varname]] [\-s [varname]] [\-P [varname]] [\-t [varname]] \-f format infile
+.B dbconfig\-load\-include [\-hv] [\-a] [\-d[varname]] [\-u[varname]] [\-p[varname]] [\-s[varname]] [\-P[varname]] [\-t[varname]] \-f format infile
 .br 
 .Xc