X Strike Force X.Org X11 SVN commit: r618 - in trunk/debian: . local
Author: dnusinow
Date: 2005-09-24 17:08:53 -0500 (Sat, 24 Sep 2005)
New Revision: 618
Modified:
trunk/debian/changelog
trunk/debian/local/dexconf
trunk/debian/local/dexconf.1
trunk/debian/xserver-xorg.postinst.in
Log:
* Add a new flag to dexconf to allow the user to specify the name of the
file used in comments. This can be used to prevent it from referring to
xorg.conf.dpkg-new. Thanks Mike O'Connor. (Closes: #319323)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-24 21:55:21 UTC (rev 617)
+++ trunk/debian/changelog 2005-09-24 22:08:53 UTC (rev 618)
@@ -24,8 +24,11 @@
* Force xserver-xfree86 to transition to xserver-xorg. Do this by having
xserver-common conflict with xserver-xfree86, and having xserver-xorg not
provide xserver-xfree86 any more. Thanks Adrian Bunk. (Closes: #318425)
+ * Add a new flag to dexconf to allow the user to specify the name of the
+ file used in comments. This can be used to prevent it from referring to
+ xorg.conf.dpkg-new. Thanks Mike O'Connor. (Closes: #319323)
- -- David Nusinow <dnusinow@debian.org> Sat, 24 Sep 2005 17:53:55 -0400
+ -- David Nusinow <dnusinow@debian.org> Sat, 24 Sep 2005 18:06:23 -0400
xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
Modified: trunk/debian/local/dexconf
===================================================================
--- trunk/debian/local/dexconf 2005-09-24 21:55:21 UTC (rev 617)
+++ trunk/debian/local/dexconf 2005-09-24 22:08:53 UTC (rev 618)
@@ -41,6 +41,9 @@
Options:
-h, --help display this usage message and exit
-o FILE, --output=FILE write configuration file to FILE
+ --displayfilename=FILENAME FILE is the filename which should
+ be used in the comments
+
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
@@ -117,7 +120,7 @@
EARLYEXIT=
GETOPT_OUTPUT=$(getopt --options ho: \
- --longoptions help,output: \
+ --longoptions help,output,displayfilename: \
-n "$PROGNAME" -- "$@")
if [ $? -ne 0 ]; then
@@ -133,6 +136,7 @@
;;
-h|--help) SHOWHELP=yes EARLYEXIT=yes ;;
-o|--output) CONFIGFILE="$2"; shift ;;
+ --displayfilename) CONFIGFILEDISPLAYNAME="$2"; shift ;;
--) shift; break ;;
*)
bomb "unrecognized option \"$1\"; use \"$PROGNAME --help\" for help"
@@ -141,6 +145,10 @@
shift
done
+if [ -z "$CONFIGFILEDISPLAYNAME" ]; then
+ CONFIGFILEDISPLAYNAME=$CONFIGFILE
+fi
+
if [ -n "$SHOWHELP" ]; then
usage
fi
@@ -223,13 +231,13 @@
exec 4>"$DEXCONFTMPDIR/Header"
cat >&4 <<SECTION
-# ${CONFIGFILE##*/} ($SERVERNAME X Window System server configuration file)
+# ${CONFIGFILEDISPLAYNAME##*/} ($SERVERNAME X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
-# Edit this file with caution, and see the ${CONFIGFILE##*/} manual page.
-# (Type "man ${CONFIGFILE##*/}" at the shell prompt.)
+# Edit this file with caution, and see the ${CONFIGFILEDISPLAYNAME##*/} manual page.
+# (Type "man ${CONFIGFILEDISPLAYNAME##*/}" at the shell prompt.)
#
# This file is automatically updated on $XSERVERPKG package upgrades *only*
# if it has not been modified since the last upgrade of the $XSERVERPKG
@@ -238,8 +246,8 @@
# If you have edited this file but would like it to be automatically updated
# again, run the following commands as root:
#
-# cp $CONFIGFILE $CONFIGFILE.custom
-# md5sum $CONFIGFILE >/var/lib/xfree86/${CONFIGFILE##*/}.md5sum
+# cp ${CONFIGFILEDISPLAYNAME} ${CONFIGFILEDISPLAYNAME}.custom
+# md5sum ${CONFIGFILEDISPLAYNAME} >/var/lib/xfree86/${CONFIGFILEDISPLAYNAME##*/}.md5sum
# dpkg-reconfigure $XSERVERPKG
SECTION
Modified: trunk/debian/local/dexconf.1
===================================================================
--- trunk/debian/local/dexconf.1 2005-09-24 21:55:21 UTC (rev 617)
+++ trunk/debian/local/dexconf.1 2005-09-24 22:08:53 UTC (rev 618)
@@ -114,6 +114,12 @@
.B dexconf
unconditionally overwrites its destination file if it has sufficient access
rights to do so.
+.TP
+.BI \-\-displayfilename= filename
+In the file created there are instruction in the comments which refer to the
+generated file itself. This switch will let you override the filename used
+in these commends. If ommited, the filename will default to the --output
+filename
.SH ENVIRONMENT
.TP
.B COLUMNS
Modified: trunk/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xserver-xorg.postinst.in 2005-09-24 21:55:21 UTC (rev 617)
+++ trunk/debian/xserver-xorg.postinst.in 2005-09-24 22:08:53 UTC (rev 618)
@@ -780,7 +780,7 @@
warn "overwriting possibly-customised configuration file; backup" \
"in $BACKUP_XORGCONFIG"
fi
- if dexconf -o "$NEW_XORGCONFIG"; then
+ if dexconf -o "$NEW_XORGCONFIG" --displayfilename "$XORGCONFIG"; then
if ! cmp -s "$XORGCONFIG" "$NEW_XORGCONFIG"; then
mv "$NEW_XORGCONFIG" "$XORGCONFIG"
md5sum "$XORGCONFIG" > "$XORGCONFIG_CHECKSUM"
Reply to: