X Strike Force XFree86 SVN commit: r1505 - in trunk/debian: . local
Author: branden
Date: 2004-06-03 11:34:14 -0500 (Thu, 03 Jun 2004)
New Revision: 1505
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/local/dexconf
trunk/debian/local/dexconf.1
Log:
Add -s, --stdout option to dexconf, and document this new option in its
manpage. This option instructs dexconf to write the generated
configuration file to standard output.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-06-03 04:15:26 UTC (rev 1504)
+++ trunk/debian/CHANGESETS 2004-06-03 16:34:14 UTC (rev 1505)
@@ -45,4 +45,9 @@
to Michel Dänzer for diagnosing the problem. (Closes: #251307)
1504
+Add -s, --stdout option to dexconf, and document this new option in its
+manpage. This option instructs dexconf to write the generated
+configuration file to standard output.
+ 1505
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-06-03 04:15:26 UTC (rev 1504)
+++ trunk/debian/changelog 2004-06-03 16:34:14 UTC (rev 1505)
@@ -55,8 +55,12 @@
symbols xf86XVCopyYUV12ToPacked and xf86XVCopyPacked to drivers. Thanks
to Michel Dänzer for diagnosing the problem. (Closes: #251307)
- -- Branden Robinson <branden@debian.org> Wed, 2 Jun 2004 03:47:39 -0500
+ * Add -s, --stdout option to dexconf, and document this new option in its
+ manpage. This option instructs dexconf to write the generated
+ configuration file to standard output.
+ -- Branden Robinson <branden@debian.org> Thu, 3 Jun 2004 11:32:26 -0500
+
xfree86 (4.3.0.dfsg.1-4) unstable; urgency=medium
* The "thanks for the 'testing'" release.
Modified: trunk/debian/local/dexconf
===================================================================
--- trunk/debian/local/dexconf 2004-06-03 04:15:26 UTC (rev 1504)
+++ trunk/debian/local/dexconf 2004-06-03 16:34:14 UTC (rev 1505)
@@ -39,6 +39,7 @@
-f FORMAT, --format=FORMAT write file in XFree86 FORMAT style (3 or 4)
-h, --help display this usage message and exit
-o FILE, --output=FILE write configuration file to FILE
+ -s, --stdout write configuration file to standard output
This help message is intended only as a quick reference. For a description of
the usage of $PROGNAME, see the $PROGNAME(1) manual page.
EOF
@@ -68,9 +69,10 @@
PROGNAME=${0##*/}
SHOWHELP=
EARLYEXIT=
+STDOUT=
-GETOPT_OUTPUT=$(getopt --options f:ho: \
- --longoptions format:,help,output: \
+GETOPT_OUTPUT=$(getopt --options f:ho:s \
+ --longoptions format:,help,output:,stdout \
-n "$PROGNAME" -- "$@")
if [ $? -ne 0 ]; then
@@ -84,6 +86,7 @@
-f|--format) FORMAT="$2"; shift ;;
-h|--help) SHOWHELP=yes EARLYEXIT=yes ;;
-o|--output) XF86CONFIG="$2"; shift ;;
+ -s|--stdout) STDOUT=yes ;;
--) shift; break ;;
*) bomb "error while parsing options; use \"$PROGNAME --help\" for help" ;;
esac
@@ -792,12 +795,20 @@
else
cp "$DEXCONFTMPDIR/dexconf-out" "$TMP"
fi
- if ! mv "$TMP" "$XF86CONFIG"; then
- bomb "unable to write to \"$XF86CONFIG\"."
+ if [ -n "$STDOUT" ]; then
+ cat "$DEXCONFTMPDIR/dexconf-out"
+ else
+ if ! mv "$TMP" "$XF86CONFIG"; then
+ bomb "unable to write to \"$XF86CONFIG\"."
+ fi
fi
else
- if ! mv "$DEXCONFTMPDIR/dexconf-out" "$XF86CONFIG"; then
- bomb "unable to write to \"$XF86CONFIG\"."
+ if [ -n "$STDOUT" ]; then
+ cat "$DEXCONFTMPDIR/dexconf-out"
+ else
+ if ! mv "$DEXCONFTMPDIR/dexconf-out" "$XF86CONFIG"; then
+ bomb "unable to write to \"$XF86CONFIG\"."
+ fi
fi
fi
Modified: trunk/debian/local/dexconf.1
===================================================================
--- trunk/debian/local/dexconf.1 2004-06-03 04:15:26 UTC (rev 1504)
+++ trunk/debian/local/dexconf.1 2004-06-03 16:34:14 UTC (rev 1505)
@@ -17,7 +17,7 @@
.\" the Debian operating system, in /usr/share/common-licenses/GPL; if
.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
.\" Suite 330, Boston, MA 02111-1307 USA
-.TH dexconf 1 "2004\-03\-25" "Debian Project"
+.TH dexconf 1 "2004\-06\-03" "Debian Project"
.SH NAME
dexconf \- generate XFree86 X server configuration file from debconf database values
.SH SYNOPSIS
@@ -112,6 +112,9 @@
to write to
.I file
instead.
+.TP
+.B \-s\fR,\fB \-\-stdout
+Write the generated configuration file to standard output.
.SH ENVIRONMENT
.TP
.B COLUMNS
Reply to: