X Strike Force SVN commit: rev 407 - trunk/debian
Author: branden
Date: 2003-08-19 19:44:26 -0500 (Tue, 19 Aug 2003)
New Revision: 407
Modified:
trunk/debian/xserver-common.postinst.in
trunk/debian/xserver-common.preinst.in
trunk/debian/xserver-xfree86.postinst.in
trunk/debian/xserver-xfree86.preinst.in
trunk/debian/xserver-xfree86.prerm.in
Log:
(cosmetic) cleanups to user-visible messages
debian/xserver-common.postinst.in
debian/xserver-common.preinst.in
debian/xserver-xfree86.postinst.in
debian/xserver-xfree86.preinst.in
debian/xserver-xfree86.prerm.in
Modified: trunk/debian/xserver-common.postinst.in
===================================================================
--- trunk/debian/xserver-common.postinst.in 2003-08-20 00:36:10 UTC (rev 406)
+++ trunk/debian/xserver-common.postinst.in 2003-08-20 00:44:26 UTC (rev 407)
@@ -64,14 +64,14 @@
fi
rm -f "$NEW_XWRAPPER_CONFIG"
else
- message "Note: not updating $XWRAPPER_CONFIG; file has been customized"
+ message "Note: not updating $XWRAPPER_CONFIG; file has been customized."
fi
else
message "Note: not updating $XWRAPPER_CONFIG; no stored MD5 checksum" \
- "available"
+ "available."
fi
else
- message "Note: not updating $XWRAPPER_CONFIG; file does not exist"
+ message "Note: not updating $XWRAPPER_CONFIG; file does not exist."
fi
exit 0
Modified: trunk/debian/xserver-common.preinst.in
===================================================================
--- trunk/debian/xserver-common.preinst.in 2003-08-20 00:36:10 UTC (rev 406)
+++ trunk/debian/xserver-common.preinst.in 2003-08-20 00:44:26 UTC (rev 407)
@@ -31,7 +31,8 @@
# /etc/X11/Xserver obsolete as of 4.0.1-6
if [ -e /etc/X11/Xserver ]; then
- message "Note: Moving obsolete file /etc/X11/Xserver to /etc/X11/Xserver.xserver-common-backup"
+ message "Note: Moving obsolete file /etc/X11/Xserver to" \
+ "/etc/X11/Xserver.xserver-common-backup."
mv /etc/X11/Xserver /etc/X11/Xserver.xserver-common-backup
fi
@@ -66,7 +67,7 @@
# quiet
message "Note: migrating $XWRAPPER_CONFIG away from management" \
"by debconf; backup stored in $XWRAPPER_CONFIG.dpkg-old" \
- "and MD5 checksum stored in $XWRAPPER_CONFIG_CHECKSUM"
+ "and MD5 checksum stored in $XWRAPPER_CONFIG_CHECKSUM."
md5sum "$XWRAPPER_CONFIG" > "$XWRAPPER_CONFIG_CHECKSUM"
cp "$XWRAPPER_CONFIG" "$XWRAPPER_CONFIG.dpkg-old"
fi
Modified: trunk/debian/xserver-xfree86.postinst.in
===================================================================
--- trunk/debian/xserver-xfree86.postinst.in 2003-08-20 00:36:10 UTC (rev 406)
+++ trunk/debian/xserver-xfree86.postinst.in 2003-08-20 00:44:26 UTC (rev 407)
@@ -65,7 +65,7 @@
readlink "$SERVER_SYMLINK" | m5sum > "$SERVER_SYMLINK_CHECKSUM"
else
message "Note: not updating $SERVER_SYMLINK; it is a symbolic" \
- "link to a directory"
+ "link to a directory."
fi
fi
fi
@@ -74,17 +74,17 @@
else
message "Note: not updating $SERVER_SYMLINK; no default X server" \
"configured; run \"dpkg-reconfigure $THIS_PACKAGE\" to" \
- "correct this"
+ "correct this."
fi
else
- message "Note: not updating $SERVER_SYMLINK; file has been customized"
+ message "Note: not updating $SERVER_SYMLINK; file has been customized."
fi
else
message "Note: not updating $SERVER_SYMLINK; no stored MD5 checksum" \
- "available"
+ "available."
fi
else
- message "Note: not updating $SERVER_SYMLINK; file does not exist"
+ message "Note: not updating $SERVER_SYMLINK; file does not exist."
fi
# only mess with X server config file if it exists; if it does not, assume
@@ -108,18 +108,18 @@
else
message "Note: error while preparing new XFree86 X server" \
"configuration file in $NEW_XF86CONFIG; not attempting to" \
- "update existing configuration"
+ "update existing configuration."
fi
rm -f "$NEW_XF86CONFIG"
else
- message "Note: not updating $XF86CONFIG; file has been customized"
+ message "Note: not updating $XF86CONFIG; file has been customized."
fi
else
message "Note: not updating $XF86CONFIG; no stored MD5 checksum" \
- "available"
+ "available."
fi
else
- message "Note: not updating $XF86CONFIG; file does not exist"
+ message "Note: not updating $XF86CONFIG; file does not exist."
fi
# register X server configlet
Modified: trunk/debian/xserver-xfree86.preinst.in
===================================================================
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-20 00:36:10 UTC (rev 406)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-08-20 00:44:26 UTC (rev 407)
@@ -52,7 +52,7 @@
message "Note: migrating $SERVER_SYMLINK away from management" \
"by debconf; backup stored in" \
"$SERVER_SYMLINK.dpkg-old and MD5 checksum stored in" \
- "$SERVER_SYMLINK_CHECKSUM"
+ "$SERVER_SYMLINK_CHECKSUM."
readlink "$SERVER_SYMLINK" | md5sum > "$SERVER_SYMLINK_CHECKSUM"
ln -s "$(readlink "$SERVER_SYMLINK")" "$SERVER_SYMLINK.dpkg-old"
fi
@@ -75,7 +75,7 @@
# keep people quiet
message "Note: migrating $XF86CONFIG away from management by" \
"debconf; backup stored in $XF86CONFIG.dpkg-old and" \
- "MD5 checksum stored in $XF86CONFIG_CHECKSUM"
+ "MD5 checksum stored in $XF86CONFIG_CHECKSUM."
md5sum "$XF86CONFIG" > "$XF86CONFIG_CHECKSUM"
cp "$XF86CONFIG" "$XF86CONFIG.dpkg-old"
fi
Modified: trunk/debian/xserver-xfree86.prerm.in
===================================================================
--- trunk/debian/xserver-xfree86.prerm.in 2003-08-20 00:36:10 UTC (rev 406)
+++ trunk/debian/xserver-xfree86.prerm.in 2003-08-20 00:44:26 UTC (rev 407)
@@ -35,7 +35,8 @@
db_input critical shared/default-x-server || true
db_go
db_get shared/default-x-server
- message "Note: Run \"dpkg-reconfigure $RET\" before attempting to start the X server again."
+ message "Note: Run \"dpkg-reconfigure $RET\" before attempting to" \
+ "start the X server again."
fi
fi
fi
Reply to: