X Strike Force XFree86 SVN commit: rev 962 - branches/4.3.0/sid/debian
Author: branden
Date: 2004-01-22 13:05:32 -0500 (Thu, 22 Jan 2004)
New Revision: 962
Modified:
branches/4.3.0/sid/debian/xfree86-common.preinst.in
Log:
(cosmetic) Fix wrong and very confusing comment.
Modified: branches/4.3.0/sid/debian/xfree86-common.preinst.in
===================================================================
--- branches/4.3.0/sid/debian/xfree86-common.preinst.in 2004-01-22 17:54:23 UTC (rev 961)
+++ branches/4.3.0/sid/debian/xfree86-common.preinst.in 2004-01-22 18:05:32 UTC (rev 962)
@@ -16,10 +16,10 @@
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
# In xbase 3.3.2.3a-2 (October 1998), /etc/X11/Xresources became a directory.
- # Prior to that, it was a symbolic link to /usr/X11R6/lib/X11/doc. Because
- # dpkg will unpack through symlinks to directories and we must avoid this,
- # refuse to install if /etc/X11/Xresources exists and is not a directory when
- # this package is installed.
+ # Prior to that, it was a conffile. Because it may have been customized by
+ # the administrator and we must avoid clobbering it, refuse to install if
+ # /etc/X11/Xresources exists and is not a directory when this package is
+ # installed.
if [ -e /etc/X11/Xresources -a ! -d /etc/X11/Xresources ]; then
ERRMSG="/etc/X11/Xresources exists and is not a directory;"
ERRMSG="$ERRMSG the xfree86-common package cannot be installed until this"
Reply to: