X Strike Force XFree86 SVN commit: rev 693 - trunk/debian
Author: branden
Date: 2003-10-21 23:37:31 -0500 (Tue, 21 Oct 2003)
New Revision: 693
Modified:
trunk/debian/changelog
trunk/debian/twm.preinst.in
trunk/debian/xbase-clients.preinst.in
trunk/debian/xdm.postinst.in
trunk/debian/xdm.postrm.in
trunk/debian/xdm.preinst.in
trunk/debian/xdm.prerm.in
trunk/debian/xfree86-common.config.in
trunk/debian/xfree86-common.postinst.in
trunk/debian/xfree86-common.postrm.in
trunk/debian/xfree86-common.preinst.in
trunk/debian/xfs.preinst.in
trunk/debian/xlibs.preinst.in
trunk/debian/xserver-common.config.in
trunk/debian/xserver-common.postinst.in
trunk/debian/xserver-common.preinst.in
trunk/debian/xserver-xfree86.config.in
trunk/debian/xserver-xfree86.postinst.in
trunk/debian/xserver-xfree86.preinst.in
trunk/debian/xserver-xfree86.prerm.in
trunk/debian/xutils.preinst.in
Log:
Convert message()-using maintainer scripts to use the new
observe()/warn()/die() approach.
- debian/twm.preinst.in
- debian/xbase-clients.postinst.in
- debian/xdm.postinst.in
- debian/xdm.postrm.in
- debian/xdm.preint.in
- debian/xdm.prerm.in
- debian/xfs.preinst.in
- debian/xfree86-common.config.in
- debian/xfree86-common.postinst.in
- debian/xfree86-common.postrm.in
- debian/xfree86-common.preinst.in
- debian/xlibs.preinst.in
- debian/xserver-common.config.in
- debian/xserver-common.postinst.in
- debian/xserver-common.preinst.in
- debian/xserver-xfree86.config.in
- debian/xserver-xfree86.postinst.in
- debian/xserver-xfree86.preinst.in
- debian/xserver-xfree86.prerm.in
- debian/xutils.preinst.in
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/changelog 2003-10-22 04:37:31 UTC (rev 693)
@@ -79,7 +79,7 @@
- observe(): used for any user communication that is not fairly
important; not seen by default, but visible when the
$DEBUG_XFREE86_PACKAGE variable is set in the environment to a non-null
- value; also someday when dpkg supports logging, we'll sent these
+ value; also someday when dpkg supports logging, we'll send these
messages its way
- warn(): new function, used for communicating important information
- die(): new function, used for hideous death screams
@@ -112,8 +112,31 @@
- use observe() instead of debugmsg()
- debian/shell-lib.sh
- -- Branden Robinson <branden@debian.org> Tue, 21 Oct 2003 23:25:38 -0500
+ * Convert message()-using maintainer scripts to use the new
+ observe()/warn()/die() approach.
+ - debian/twm.preinst.in
+ - debian/xbase-clients.postinst.in
+ - debian/xdm.postinst.in
+ - debian/xdm.postrm.in
+ - debian/xdm.preint.in
+ - debian/xdm.prerm.in
+ - debian/xfs.preinst.in
+ - debian/xfree86-common.config.in
+ - debian/xfree86-common.postinst.in
+ - debian/xfree86-common.postrm.in
+ - debian/xfree86-common.preinst.in
+ - debian/xlibs.preinst.in
+ - debian/xserver-common.config.in
+ - debian/xserver-common.postinst.in
+ - debian/xserver-common.preinst.in
+ - debian/xserver-xfree86.config.in
+ - debian/xserver-xfree86.postinst.in
+ - debian/xserver-xfree86.preinst.in
+ - debian/xserver-xfree86.prerm.in
+ - debian/xutils.preinst.in
+ -- Branden Robinson <branden@debian.org> Tue, 21 Oct 2003 23:36:12 -0500
+
xfree86 (4.2.1-12.1) unstable; urgency=low
* Fix typo in xlibs preinst. Closes: #213774, #213776
Modified: trunk/debian/twm.preinst.in
===================================================================
--- trunk/debian/twm.preinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/twm.preinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -15,7 +15,7 @@
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
# twm dir moved to /etc/X11 in 4.x
if [ -e /usr/X11R6/lib/X11/twm -a ! -L /usr/X11R6/lib/X11/twm ]; then
- message "Note: Removing obsolete /usr/X11R6/lib/X11/twm directory."
+ observe "removing obsolete /usr/X11R6/lib/X11/twm directory"
mv /usr/X11R6/lib/X11/twm /usr/X11R6/lib/X11/twm.moved-by-preinst
fi
check_symlinks_and_warn /usr/X11R6/lib/X11/twm
Modified: trunk/debian/xbase-clients.preinst.in
===================================================================
--- trunk/debian/xbase-clients.preinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xbase-clients.preinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -18,7 +18,7 @@
# xinit and xsm dirs moved to /etc/X11 in 4.x
for DIR in xinit xsm; do
if [ -e /usr/X11R6/lib/X11/$DIR -a ! -L /usr/X11R6/lib/X11/$DIR ]; then
- message "Note: Removing obsolete /usr/X11R6/lib/X11/$DIR directory."
+ observe "removing obsolete /usr/X11R6/lib/X11/$DIR directory"
mv /usr/X11R6/lib/X11/$DIR /usr/X11R6/lib/X11/$DIR.moved-by-preinst
fi
done
@@ -29,7 +29,7 @@
/etc/X11/xkb/xkbcomp
if [ -d /var/state/xkb ]; then
- message "Note: Removing obsolete directory /var/state/xkb."
+ observe "removing obsolete directory /var/state/xkb"
rm -r /var/state/xkb
fi
@@ -37,7 +37,7 @@
if dpkg --compare-versions "$2" lt "3.3.2.3a-1"; then
if [ -L /etc/X11/xinit/xinitrc \
-a "$(readlink /etc/X11/xinitrc)" = "../Xsession" ]; then
- message "Note: Removing obsolete symbolic link /etc/X11/xinit/xinitrc."
+ observe "removing obsolete symbolic link /etc/X11/xinit/xinitrc"
rm /etc/X11/xinit/xinitrc
fi
fi
Modified: trunk/debian/xdm.postinst.in
===================================================================
--- trunk/debian/xdm.postinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xdm.postinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -26,7 +26,7 @@
# now safe to remove obsolete conffiles
for F in /etc/X11/xdm/Xreset /etc/X11/xdm/Xsetup; do
- debugmsg "committing removal of obsolete conffile $F"
+ observe "committing removal of obsolete conffile $F"
remove_conffile_commit "$F"
done
@@ -80,9 +80,9 @@
if [ -n "$XDM_RUNNING" ]; then
if [ -d /var/state/xdm ]; then
- message "Note: obsolete directory /var/state/xdm cannot be removed" \
- "because xdm is still running. Reinstall the xdm package" \
- "(or remove the directory manually) when xdm is not running."
+ warn "obsolete directory /var/state/xdm cannot be removed because xdm is" \
+ "still running; reinstall the xdm package (or remove the directory" \
+ "manually) when xdm is not running"
fi
else
if [ -d /var/state/xdm ]; then
Modified: trunk/debian/xdm.postrm.in
===================================================================
--- trunk/debian/xdm.postrm.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xdm.postrm.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -23,7 +23,7 @@
# roll back removal of obsolete conffiles
for F in /etc/X11/xdm/Xreset /etc/X11/xdm/Xsetup; do
- debugmsg "rolling back removal of obsolete conffile $F"
+ observe "rolling back removal of obsolete conffile $F"
remove_conffile_rollback "$F"
done
Modified: trunk/debian/xdm.preinst.in
===================================================================
--- trunk/debian/xdm.preinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xdm.preinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -19,7 +19,7 @@
if dpkg --compare-versions "$2" lt "3.3.2-1"; then
for DIR in rc0.d rc1.d rc6.d; do
if [ -L "/etc/$DIR/K1xdm" ]; then
- debugmsg "fixing buggy symbolic link /etc/$DIR/K1xdm"
+ observe "fixing buggy symbolic link /etc/$DIR/K1xdm"
mv "/etc/$DIR/K1xdm" "/etc/$DIR/K01xdm"
fi
done
@@ -30,7 +30,7 @@
# of the way (even if we're installing over a non-packaged XFree86
# installation)
if [ -e /usr/X11R6/lib/X11/xdm -a ! -L /usr/X11R6/lib/X11/xdm ]; then
- debugmsg "removing obsolete /usr/X11R6/lib/X11/xdm directory"
+ observe "removing obsolete /usr/X11R6/lib/X11/xdm directory"
mv /usr/X11R6/lib/X11/xdm /usr/X11R6/lib/X11/xdm.moved-by-preinst
fi
@@ -38,7 +38,7 @@
if dpkg --compare-versions "$2" lt "4.0.3-1"; then
if update-alternatives --display xdm-greeter |
fgrep -q /usr/X11R6/lib/libXdmGreet.so.1; then
- debugmsg "removing obsolete xdm-greeter alternative and .so symlink"
+ observe "removing obsolete xdm-greeter alternative and .so symlink"
update-alternatives --remove xdm-greeter /usr/X11R6/lib/libXdmGreet.so.1
# remove this garbage link that ldconfig creates
rm -f /usr/X11R6/lib/libXdmGreet.so
@@ -47,8 +47,8 @@
# default Xreset and Xsetup conffiles went away in 4.2.1-12
if dpkg --compare-versions "$2" lt "4.2.1-12"; then
- debugmsg "preparing obsolete conffiles /etc/X11/xdm/Xreset and" \
- "/etc/X11/xdm/Xsetup for removal"
+ observe "preparing obsolete conffiles /etc/X11/xdm/Xreset and" \
+ "/etc/X11/xdm/Xsetup for removal"
remove_conffile_prepare /etc/X11/xdm/Xreset d65cd850f647f7f3d6a076273a3bbb1f
remove_conffile_prepare /etc/X11/xdm/Xsetup 9e68b23946b72af86f88593394ba9339
fi
Modified: trunk/debian/xdm.prerm.in
===================================================================
--- trunk/debian/xdm.prerm.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xdm.prerm.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -45,7 +45,7 @@
for PROCESS in $PARENTS; do
# make sure we got numbers back
[ $PROCESS -eq $PROCESS ] 2> /dev/null ||
- errormsg "ERROR: pidof returned non-numeric value!"
+ die "pidof returned non-numeric value"
# we could use grep -q here if ps would ignore SIGPIPE :-P
if (ps axj | grep "^ *$PROCESS" > /dev/null 2>&1); then
CHILDREN=yes
@@ -114,7 +114,9 @@
if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
safe_debconf db_get shared/default-x-display-manager
if [ -n "$RET" ]; then
- message "Please be sure to run \"dpkg-reconfigure $RET\"."
+ warn "new default display manager has been selected; please be" \
+ "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \
+ "is configured"
safe_debconf db_get "$RET"/daemon_name
if [ -n "$RET" ]; then
echo "$RET" > "$DEFAULT_DISPLAY_MANAGER_FILE"
Modified: trunk/debian/xfree86-common.config.in
===================================================================
--- trunk/debian/xfree86-common.config.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xfree86-common.config.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -18,7 +18,7 @@
# is this an unofficial Debian package?
if [ -z "$OFFICIAL_BUILD" ]; then
- debugmsg "unofficial build detected; issuing debconf note as warning"
+ observe "unofficial build detected; issuing debconf note as warning"
safe_debconf db_register xfree86-common/experimental_packages \
xfree86-common/nag
safe_debconf db_input high xfree86-common/nag
Modified: trunk/debian/xfree86-common.postinst.in
===================================================================
--- trunk/debian/xfree86-common.postinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xfree86-common.postinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -23,14 +23,13 @@
# ensure that /etc/X11/Xresources is now a directory (see preinst)
if [ ! -d /etc/X11/Xresources ]; then
- errormsg "/etc/X11/Xresources is not a directory. " \
- "Either the package didn't ship the directory (a bug in the" \
- "package), or dpkg failed to unpack it to the filesystem (a" \
- "bug in dpkg)."
+ die "/etc/X11/Xresources is not a directory; either the package didn't ship" \
+ "the directory (a bug in the package), or dpkg failed to unpack it to" \
+ "the filesystem (a bug in dpkg)"
fi
-debugmsg "committing removal of obsolete conffile" \
- "/etc/X11/Xsession.d/40xfree86-common_xmodmap"
+observe "committing removal of obsolete conffile" \
+ "/etc/X11/Xsession.d/40xfree86-common_xmodmap"
remove_conffile_commit /etc/X11/Xsession.d/40xfree86-common_xmodmap
if [ -e /etc/init.d/xfree86-common ]; then
Modified: trunk/debian/xfree86-common.postrm.in
===================================================================
--- trunk/debian/xfree86-common.postrm.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xfree86-common.postrm.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -15,8 +15,8 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then
- debugmsg "rolling back removal of obsolete conffile" \
- "/etc/X11/Xsession.d/40xfree86-common_xmodmap"
+ observe "rolling back removal of obsolete conffile" \
+ "/etc/X11/Xsession.d/40xfree86-common_xmodmap"
remove_conffile_rollback /etc/X11/Xsession.d/40xfree86-common_xmodmap
fi
Modified: trunk/debian/xfree86-common.preinst.in
===================================================================
--- trunk/debian/xfree86-common.preinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xfree86-common.preinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -21,26 +21,25 @@
# 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"
+ ERRMSG="/etc/X11/Xresources exists and is not a directory;"
+ ERRMSG="$ERRMSG the xfree86-common package cannot be installed until this"
if [ -f /etc/X11/Xresources ]; then
ERRMSG="$ERRMSG file"
else
ERRMSG="$ERRMSG thing"
fi
- ERRMSG="$ERRMSG is removed. "
- ERRMSG="$ERRMSG Aborting installation of $THIS_PACKAGE package."
- errormsg "$ERRMSG"
+ ERRMSG="$ERRMSG is removed"
+ die "$ERRMSG"
fi
if dpkg --compare-versions "$2" lt "3.3.6-5"; then
- debugmsg "removing obsolete /etc/X11/window-managers file"
+ observe "removing obsolete /etc/X11/window-managers file"
rm -f /etc/X11/window-managers
fi
if dpkg --compare-versions "$2" lt "4.1.0-7"; then
- debugmsg "preparing obsolete conffile" \
- "/etc/X11/Xsession.d/40xfree86-common_xmodmap for removal"
+ observe "preparing obsolete conffile" \
+ "/etc/X11/Xsession.d/40xfree86-common_xmodmap for removal"
remove_conffile_prepare /etc/X11/Xsession.d/40xfree86-common_xmodmap \
b370a42803aec72f27da67ca6a225402
fi
Modified: trunk/debian/xfs.preinst.in
===================================================================
--- trunk/debian/xfs.preinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xfs.preinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -15,14 +15,14 @@
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
# fs dir moved to /etc/X11 in 4.x
if [ -e /usr/X11R6/lib/X11/fs -a ! -L /usr/X11R6/lib/X11/fs ]; then
- message "Note: Removing obsolete /usr/X11R6/lib/X11/fs directory."
+ observe "removing obsolete /usr/X11R6/lib/X11/fs directory"
mv /usr/X11R6/lib/X11/fs /usr/X11R6/lib/X11/fs.moved-by-preinst
fi
# /etc/X11/xfs dir renamed to /etc/X11/fs in 4.x
if [ -d /etc/X11/xfs -a ! -e /etc/X11/fs ]; then
- message "Note: Moving X font server configuration directory /etc/X11/xfs" \
- "to /etc/X11/fs."
+ observe "moving X font server configuration directory /etc/X11/xfs" \
+ "to /etc/X11/fs"
mv /etc/X11/xfs /etc/X11/fs
touch /etc/X11/xfs.moved-by-preinst
fi
Modified: trunk/debian/xlibs.preinst.in
===================================================================
--- trunk/debian/xlibs.preinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xlibs.preinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -16,7 +16,7 @@
# app-defaults and xkb directories moved in 4.0
for DIR in app-defaults xkb; do
if [ -e /usr/X11R6/lib/X11/$DIR -a ! -L /usr/X11R6/lib/X11/$DIR ]; then
- message "Note: Removing obsolete /usr/X11R6/lib/X11/$DIR directory."
+ observe "removing obsolete /usr/X11R6/lib/X11/$DIR directory"
mv /usr/X11R6/lib/X11/$DIR /usr/X11R6/lib/X11/$DIR.moved-by-preinst
fi
done
@@ -28,13 +28,13 @@
# woody could make it insane
LINK="/etc/X11/app-defaults/app-defaults"
if [ -L "$LINK" ]; then
- debugmsg "Removing bogus symbolic link $LINK."
+ observe "removing bogus symbolic link $LINK"
rm -f "$LINK"
fi
# clean up after 3.3.2.3a-2 to 3.3.2.3a-7
if [ -L /usr/X11R6/lib/X11/locale ]; then
- message "Note: Removing /usr/X11R6/lib/X11/locale symbolic link."
+ observe "removing /usr/X11R6/lib/X11/locale symbolic link"
rm /usr/X11R6/lib/X11/locale
fi
fi
Modified: trunk/debian/xserver-common.config.in
===================================================================
--- trunk/debian/xserver-common.config.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xserver-common.config.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -32,8 +32,8 @@
;;
*)
# garbage input; return default
- debugmsg "allowed_users_english_to_actual(): unrecognized input \"$1\";" \
- "using default"
+ observe "allowed_users_english_to_actual(): unrecognized input \"$1\";" \
+ "using default"
echo "console"
;;
esac
@@ -52,8 +52,8 @@
;;
*)
# garbage input; return default
- debugmsg "allowed_users_actual_to_english(): unrecognized input \"$1\";" \
- "using default"
+ observe "allowed_users_actual_to_english(): unrecognized input \"$1\";" \
+ "using default"
echo "Console Users Only"
;;
esac
@@ -87,7 +87,7 @@
LINUX_KERNEL_VERSION=${LINUX_KERNEL_FLAVOR%%-*}
# it kinda sucks that I have to use dpkg for this
if dpkg --compare-versions "$LINUX_KERNEL_VERSION" gt "2.5"; then
- debugmsg "Linux kernel > 2.5 detected; using 0 as default nice value"
+ observe "Linux kernel > 2.5 detected; using 0 as default nice value"
NICE_DEFAULT=0
fi
fi
@@ -118,15 +118,15 @@
fi
if [ -n "$CURRENT_ALLOWED_USERS" ]; then
- debugmsg "setting xserver-common/xwrapper/allowed_users from configuration" \
- "file"
+ observe "setting xserver-common/xwrapper/allowed_users from configuration" \
+ "file"
safe_debconf db_set xserver-common/xwrapper/allowed_users \
$(allowed_users_actual_to_english \
"$CURRENT_ALLOWED_USERS")
fi
if [ -n "$CURRENT_NICE_VALUE" ]; then
- debugmsg "setting xserver-common/xwrapper/nice_value from configuration file"
+ observe "setting xserver-common/xwrapper/nice_value from configuration file"
if validate_nice_value "$CURRENT_NICE_VALUE"; then
safe_debconf db_set xserver-common/xwrapper/nice_value \
"$CURRENT_NICE_VALUE"
Modified: trunk/debian/xserver-common.postinst.in
===================================================================
--- trunk/debian/xserver-common.postinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xserver-common.postinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -69,17 +69,17 @@
fi
rm -f "$NEW_XWRAPPER_CONFIG"
else
- debugmsg "not updating $XWRAPPER_CONFIG; problems communicating" \
- "with debconf database"
+ observe "not updating $XWRAPPER_CONFIG; problems communicating" \
+ "with debconf database"
fi
else
- debugmsg "not updating $XWRAPPER_CONFIG; file has been customized"
+ observe "not updating $XWRAPPER_CONFIG; file has been customized"
fi
else
- debugmsg "not updating $XWRAPPER_CONFIG; no stored checksum available"
+ observe "not updating $XWRAPPER_CONFIG; no stored checksum available"
fi
else
- debugmsg "not updating $XWRAPPER_CONFIG; file does not exist"
+ observe "not updating $XWRAPPER_CONFIG; file does not exist"
fi
fi
Modified: trunk/debian/xserver-common.preinst.in
===================================================================
--- trunk/debian/xserver-common.preinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xserver-common.preinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -24,14 +24,14 @@
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
# xserver dir moved to /etc/X11 in 4.x
if [ -e /usr/X11R6/lib/X11/xserver -a ! -L /usr/X11R6/lib/X11/xserver ]; then
- debugmsg "removing obsolete /usr/X11R6/lib/X11/xserver directory"
+ observe "removing obsolete /usr/X11R6/lib/X11/xserver directory"
mv /usr/X11R6/lib/X11/xserver /usr/X11R6/lib/X11/xserver.moved-by-preinst
fi
check_symlinks_and_warn /usr/X11R6/lib/X11/xserver
# create the configuration files' auxiliary directory if it doesn't exist
if [ ! -e "$CONFIG_AUX_DIR" ]; then
- debugmsg "creating $CONFIG_AUX_DIR"
+ observe "creating $CONFIG_AUX_DIR"
mkdir --mode=755 --parents "$CONFIG_AUX_DIR"
fi
@@ -71,10 +71,9 @@
# the instructions that would make the maintainer scripts ignore
# it, so store a backup so they can rescue themselves from their
# own ignorance
- message "Note: migrating $XWRAPPER_CONFIG away from" \
- "management by debconf; backup stored in" \
- "$XWRAPPER_CONFIG.dpkg-old and checksum stored in" \
- "$XWRAPPER_CONFIG_CHECKSUM."
+ observe "migrating $XWRAPPER_CONFIG away from management by" \
+ "debconf; backup stored in $XWRAPPER_CONFIG.dpkg-old" \
+ "and 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.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xserver-xfree86.config.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -33,7 +33,7 @@
if [ -n "$DEBUG_XFREE86_DEBCONF" -o \
"$DEBCONF_DEBUG" = "user" -o \
"$DEBCONF_DEBUG" = '.*' ]; then
- message "$THIS_PACKAGE $THIS_SCRIPT debug: $*"
+ observe "$*"
fi
}
Modified: trunk/debian/xserver-xfree86.postinst.in
===================================================================
--- trunk/debian/xserver-xfree86.postinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xserver-xfree86.postinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -69,27 +69,26 @@
readlink "$SERVER_SYMLINK" | md5sum > \
"$SERVER_SYMLINK_CHECKSUM"
else
- message "Note: not updating $SERVER_SYMLINK; it is a" \
- "symbolic link to a directory."
+ observe "not updating $SERVER_SYMLINK; it is a symbolic" \
+ "link to a directory"
fi
fi
fi
rm -f "$NEW_SERVER_SYMLINK"
fi
else
- message "Note: not updating $SERVER_SYMLINK; no default X server" \
+ observe "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."
+ observe "not updating $SERVER_SYMLINK; file has been customized"
fi
else
- message "Note: not updating $SERVER_SYMLINK; no stored checksum" \
- "available."
+ observe "not updating $SERVER_SYMLINK; no stored checksum available"
fi
else
- message "Note: not updating $SERVER_SYMLINK; file does not exist."
+ observe "not updating $SERVER_SYMLINK; file does not exist"
fi
# only mess with X server config file if it exists; if it does not, assume
@@ -110,19 +109,19 @@
md5sum "$XF86CONFIG" > "$XF86CONFIG_CHECKSUM"
fi
else
- message "Note: error while preparing new XFree86 X server" \
- "configuration file in $NEW_XF86CONFIG; not attempting to" \
- "update existing configuration."
+ observe "error while preparing new XFree86 X server configuration" \
+ "file in $NEW_XF86CONFIG; not attempting to update existing" \
+ "configuration"
fi
rm -f "$NEW_XF86CONFIG"
else
- message "Note: not updating $XF86CONFIG; file has been customized."
+ observe "not updating $XF86CONFIG; file has been customized"
fi
else
- message "Note: not updating $XF86CONFIG; no stored checksum available."
+ observe "not updating $XF86CONFIG; no stored checksum available"
fi
else
- message "Note: not updating $XF86CONFIG; file does not exist."
+ observe "not updating $XF86CONFIG; file does not exist"
fi
fi
Modified: trunk/debian/xserver-xfree86.preinst.in
===================================================================
--- trunk/debian/xserver-xfree86.preinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -75,10 +75,9 @@
# people were letting debconf "manage" the config file even
# though they complained when it did so, so store a backup to
# keep people quiet
- message "Note: migrating $SERVER_SYMLINK away from management" \
- "by debconf; backup stored in" \
- "$SERVER_SYMLINK.dpkg-old and checksum stored in" \
- "$SERVER_SYMLINK_CHECKSUM."
+ observe "migrating $SERVER_SYMLINK away from management by" \
+ "debconf; backup stored in $SERVER_SYMLINK.dpkg-old" \
+ "and checksum stored in $SERVER_SYMLINK_CHECKSUM"
echo "$CURRENT_SYMLINK_TARGET" | md5sum > \
"$SERVER_SYMLINK_CHECKSUM"
ln -s "$CURRENT_SYMLINK_TARGET" "$SERVER_SYMLINK.dpkg-old"
@@ -102,10 +101,9 @@
# follow the instructions that would make the maintainer
# scripts ignore it, so store a backup so they can rescue
# themselves from their own ignorance
- message "Note: migrating $XF86CONFIG away from management" \
- "by debconf; backup stored in" \
- "$XF86CONFIG.dpkg-old and checksum stored in" \
- "$XF86CONFIG_CHECKSUM."
+ observe "migrating $XF86CONFIG away from management by" \
+ "debconf; backup stored in $XF86CONFIG.dpkg-old and" \
+ "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-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xserver-xfree86.prerm.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -52,9 +52,9 @@
if [ "$(readlink "$SERVER_SYMLINK")" \
!= "$(readlink "$NEW_SERVER_SYMLINK")" ]; then
if [ ! -d "$SERVER_SYMLINK" ]; then
- message "Note: X server provided by $THIS_PACKAGE package is" \
- "being removed; setting $SERVER_SYMLINK to point to" \
- "$UNCONFIGURED_LINK_TARGET."
+ warn "X server provided by $THIS_PACKAGE package is being" \
+ "removed; setting $SERVER_SYMLINK to point to" \
+ "$UNCONFIGURED_LINK_TARGET"
mv "$NEW_SERVER_SYMLINK" "$SERVER_SYMLINK"
readlink "$SERVER_SYMLINK" | md5sum > \
"$SERVER_SYMLINK_CHECKSUM"
@@ -80,8 +80,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."
+ warn "run \"dpkg-reconfigure $RET\" before attempting to start the X" \
+ "server again"
fi
fi
fi
Modified: trunk/debian/xutils.preinst.in
===================================================================
--- trunk/debian/xutils.preinst.in 2003-10-22 04:27:07 UTC (rev 692)
+++ trunk/debian/xutils.preinst.in 2003-10-22 04:37:31 UTC (rev 693)
@@ -15,15 +15,15 @@
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
# /etc/X11/rstartd dir renamed to /etc/X11/rstart in 4.x
if [ -d /etc/X11/rstartd -a ! -e /etc/X11/rstart ]; then
- message "Note: Moving X remote start daemon configuration directory" \
- "/etc/X11/rstartd to /etc/X11/rstart."
+ observe "moving X remote start daemon configuration directory" \
+ "/etc/X11/rstartd to /etc/X11/rstart"
mv /etc/X11/rstartd /etc/X11/rstart
touch /etc/X11/rstartd.moved-by-preinst
fi
# rstart dir moved to /etc/X11 in 4.x
if [ -e /usr/X11R6/lib/X11/rstart -a ! -L /usr/X11R6/lib/X11/rstart ]; then
- message "Note: Removing obsolete /usr/X11R6/lib/X11/rstart directory."
+ observe "removing obsolete /usr/X11R6/lib/X11/rstart directory"
mv /usr/X11R6/lib/X11/rstart /usr/X11R6/lib/X11/rstart.moved-by-preinst
fi
Reply to: