X Strike Force XFree86 SVN commit: rev 846 - in trunk/debian: . local
Author: branden
Date: 2003-12-16 12:26:57 -0500 (Tue, 16 Dec 2003)
New Revision: 846
Modified:
trunk/debian/local/dexconf
trunk/debian/xserver-common.postinst.in
Log:
Add comment block to top of generated Xwrapper.config files.
Make minor clarification in comment-block at top of dexconf-generated
XF86Config* files.
Modified: trunk/debian/local/dexconf
===================================================================
--- trunk/debian/local/dexconf 2003-12-16 17:06:43 UTC (rev 845)
+++ trunk/debian/local/dexconf 2003-12-16 17:26:57 UTC (rev 846)
@@ -170,9 +170,11 @@
if [ "$FORMAT" = "3" ]; then
cat > "$DEXCONFTMPDIR/Header" << SECTION
### BEGIN DEBCONF SECTION
-# XF86Config (XFree86 X server configuration file) generated by dexconf, the
-# Debian X Configuration tool, using values from the debconf database.
+# XF86Config (XFree86 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 XF86Config-v3 manual page.
# (Type "man XF86Config-v3" at the shell prompt.)
#
@@ -187,9 +189,11 @@
SECTION
else
cat > "$DEXCONFTMPDIR/Header" << SECTION
-# XF86Config-4 (XFree86 X server configuration file) generated by dexconf, the
-# Debian X Configuration tool, using values from the debconf database.
+# XF86Config-4 (XFree86 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 XF86Config-4 manual page.
# (Type "man XF86Config-4" at the shell prompt.)
#
Modified: trunk/debian/xserver-common.postinst.in
===================================================================
--- trunk/debian/xserver-common.postinst.in 2003-12-16 17:06:43 UTC (rev 845)
+++ trunk/debian/xserver-common.postinst.in 2003-12-16 17:26:57 UTC (rev 846)
@@ -63,6 +63,22 @@
if [ -n "$ALLOWED_USERS" -a -n "$NICE_VALUE" ]; then
NEW_XWRAPPER_CONFIG=$(tempfile)
cat > "$NEW_XWRAPPER_CONFIG" << EOF
+# Xwrapper.config (Debian X Window System server wrapper configuration file)
+#
+# This file was generated by the post-installation script of the xserver-common
+# package using values from the debconf database.
+#
+# See the Xwrapper.config(5) manual page for more information.
+#
+# This file is automatically updated on upgrades of the xserver-common package
+# *only* if it has not been modified since the last upgrade of that package.
+#
+# If you have edited this file but would like it to be automatically updated
+# again, run the following commands as root:
+#
+# cp /etc/X11/Xwrapper.config /etc/X11/Xwrapper.config.custom
+# md5sum /etc/X11/Xwrapper.config > /var/lib/xfree86/Xwrapper.config.md5sum
+# dpkg-reconfigure xserver-common
allowed_users=$ALLOWED_USERS
nice_value=$NICE_VALUE
EOF
Reply to: