Author: branden
Date: 2003-08-23 21:17:28 -0500 (Sat, 23 Aug 2003)
New Revision: 424
Modified:
trunk/debian/xserver-common.postinst.in
trunk/debian/xserver-common.postrm.in
trunk/debian/xserver-common.preinst.in
trunk/debian/xserver-xfree86.postinst.in
trunk/debian/xserver-xfree86.postrm.in
trunk/debian/xserver-xfree86.preinst.in
Log:
debian/xserver-{common,xfree86}.{preinst,postinst,postrm}.in: (cosmetic)
update some variable names to be more accurate and technology-neutral
Modified: trunk/debian/xserver-common.postinst.in
===================================================================
--- trunk/debian/xserver-common.postinst.in 2003-08-24 01:52:17 UTC (rev 423)
+++ trunk/debian/xserver-common.postinst.in 2003-08-24 02:17:28 UTC (rev 424)
@@ -18,9 +18,9 @@
#INCLUDE_SHELL_LIB#
XWRAPPER_CONFIG=/etc/X11/Xwrapper.config
-CHECKSUM_DIR=/var/lib/xfree86
-XWRAPPER_CONFIG_CHECKSUM="$CHECKSUM_DIR/$(basename "$XWRAPPER_CONFIG").md5sum"
-XWRAPPER_CONFIG_ROSTER="$CHECKSUM_DIR/$(basename "$XWRAPPER_CONFIG").roster"
+CONFIG_AUX_DIR=/var/lib/xfree86
+XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$XWRAPPER_CONFIG").md5sum"
+XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/$(basename "$XWRAPPER_CONFIG").roster"
check_symlinks_and_bomb /usr/X11R6/lib/X11/xserver
@@ -33,17 +33,17 @@
# register this package as a (potential) handler of the X server wrapper config
# file
-if [ ! -e "$CHECKSUM_DIR" ]; then
- mkdir --mode=755 --parents "$CHECKSUM_DIR"
+if [ ! -e "$CONFIG_AUX_DIR" ]; then
+ mkdir --mode=755 --parents "$CONFIG_AUX_DIR"
if ! fgrep -qsx "$THIS_PACKAGE" "$XWRAPPER_CONFIG_ROSTER" ]; then
echo "$THIS_PACKAGE" >> "$XWRAPPER_CONFIG_ROSTER"
fi
else
# if the checksum pathname does exist but is not a directory, give up; we
# will assume the user has reasons for setting things up this way
- if [ ! -d "$CHECKSUM_DIR" ]; then
+ if [ ! -d "$CONFIG_AUX_DIR" ]; then
message "Warning: cannot register $THIS_PACKAGE package as an owner of" \
- "$XWRAPPER_CONFIG; $CHECKSUM_DIR exists but is not a directory."
+ "$XWRAPPER_CONFIG; $CONFIG_AUX_DIR exists but is not a directory."
fi
fi
Modified: trunk/debian/xserver-common.postrm.in
===================================================================
--- trunk/debian/xserver-common.postrm.in 2003-08-24 01:52:17 UTC (rev 423)
+++ trunk/debian/xserver-common.postrm.in 2003-08-24 02:17:28 UTC (rev 424)
@@ -15,9 +15,9 @@
#INCLUDE_SHELL_LIB#
XWRAPPER_CONFIG=/etc/X11/Xwrapper.config
-CHECKSUM_DIR=/var/lib/xfree86
-XWRAPPER_CONFIG_CHECKSUM="$CHECKSUM_DIR/$(basename "$XWRAPPER_CONFIG").md5sum"
-XWRAPPER_CONFIG_ROSTER="$CHECKSUM_DIR/$(basename "$XWRAPPER_CONFIG").roster"
+CONFIG_AUX_DIR=/var/lib/xfree86
+XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$XWRAPPER_CONFIG").md5sum"
+XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/$(basename "$XWRAPPER_CONFIG").roster"
if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then
if [ -d /usr/X11R6/lib/X11/xserver.moved-by-preinst -a -L
/usr/X11R6/lib/X11/xserver ]; then
@@ -64,7 +64,7 @@
# we can take /etc/X11/xserver out of this list one day when dpkg fixes
# #112386
- for DIR in /etc/X11/xserver /etc/X11 "$CHECKSUM_DIR"; do
+ for DIR in /etc/X11/xserver /etc/X11 "$CONFIG_AUX_DIR"; do
rmdir "$DIR" 2> /dev/null || true
done
fi
Modified: trunk/debian/xserver-common.preinst.in
===================================================================
--- trunk/debian/xserver-common.preinst.in 2003-08-24 01:52:17 UTC (rev 423)
+++ trunk/debian/xserver-common.preinst.in 2003-08-24 02:17:28 UTC (rev 424)
@@ -18,8 +18,8 @@
#INCLUDE_SHELL_LIB#
XWRAPPER_CONFIG=/etc/X11/Xwrapper.config
-CHECKSUM_DIR=/var/lib/xfree86
-XWRAPPER_CONFIG_CHECKSUM="$CHECKSUM_DIR/$(basename "$XWRAPPER_CONFIG").md5sum"
+CONFIG_AUX_DIR=/var/lib/xfree86
+XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$XWRAPPER_CONFIG").md5sum"
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
# xserver dir moved to /etc/X11 in 4.x
@@ -44,26 +44,26 @@
if [ "$RET" = "true" ]; then
# yes; attempt to pre-seed the md5sum file based on the current content
# of the file
- WRITE_MD5SUM=yes
+ WRITE_CHECKSUM=yes
# if the config file doesn't even exist, don't bother
if [ -e "$XWRAPPER_CONFIG" ]; then
# this is the preinst, so our checksum directory might not have been
# unpacked yet (in fact, if we're upgrading from < 4.2.1-10, we
# expect it not to be)
- if [ ! -e "$CHECKSUM_DIR" ]; then
- mkdir --mode=755 "$CHECKSUM_DIR"
+ if [ ! -e "$CONFIG_AUX_DIR" ]; then
+ mkdir --mode=755 "$CONFIG_AUX_DIR"
else
# if the checksum pathname does exist but is not a directory, give
# up; we will assume the user has reasons for setting things up
# this way
- if [ ! -d "$CHECKSUM_DIR" ]; then
+ if [ ! -d "$CONFIG_AUX_DIR" ]; then
message "Warning: cannot store MD5 checksum of" \
- "$XWRAPPER_CONFIG; $CHECKSUM_DIR exists but is not a" \
+ "$XWRAPPER_CONFIG; $CONFIG_AUX_DIR exists but is not a" \
"directory."
- WRITE_MD5SUM=
+ WRITE_CHECKSUM=
fi
fi
- if [ -n "$WRITE_MD5SUM" ]; then
+ if [ -n "$WRITE_CHECKSUM" ]; then
# people were letting debconf "manage" the config file even though
# they complained when it did so, so store a backup to keep people
# quiet
Modified: trunk/debian/xserver-xfree86.postinst.in
===================================================================
--- trunk/debian/xserver-xfree86.postinst.in 2003-08-24 01:52:17 UTC (rev 423)
+++ trunk/debian/xserver-xfree86.postinst.in 2003-08-24 02:17:28 UTC (rev 424)
@@ -19,19 +19,19 @@
SERVER_SYMLINK=/etc/X11/X
XF86CONFIG=/etc/X11/XF86Config-4
-CHECKSUM_DIR=/var/lib/xfree86
-SERVER_SYMLINK_CHECKSUM="$CHECKSUM_DIR/$(basename "$SERVER_SYMLINK").md5sum"
-SERVER_SYMLINK_ROSTER="$CHECKSUM_DIR/$(basename "$SERVER_SYMLINK").roster"
-XF86CONFIG_CHECKSUM="$CHECKSUM_DIR/$(basename "$XF86CONFIG").md5sum"
-XF86CONFIG_ROSTER="$CHECKSUM_DIR/$(basename "$XF86CONFIG").roster"
+CONFIG_AUX_DIR=/var/lib/xfree86
+SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$SERVER_SYMLINK").md5sum"
+SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/$(basename "$SERVER_SYMLINK").roster"
+XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$XF86CONFIG").md5sum"
+XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/$(basename "$XF86CONFIG").roster"
THIS_SERVER=/usr/bin/X11/XFree86
#DEBHELPER#
# register this package as a (potential) handler of the X server symlink and
# XFree86 4.x X server configuration file
-if [ ! -e "$CHECKSUM_DIR" ]; then
- mkdir --mode=755 --parents "$CHECKSUM_DIR"
+if [ ! -e "$CONFIG_AUX_DIR" ]; then
+ mkdir --mode=755 --parents "$CONFIG_AUX_DIR"
for ROSTER in "$SERVER_SYMLINK_ROSTER" "$XF86CONFIG_ROSTER"; do
if ! fgrep -qsx "$THIS_PACKAGE" "$ROSTER"; then
echo "$THIS_PACKAGE" >> "$ROSTER"
@@ -40,10 +40,10 @@
else
# if the checksum pathname does exist but is not a directory, give up; we
# will assume the user has reasons for setting things up this way
- if [ ! -d "$CHECKSUM_DIR" ]; then
+ if [ ! -d "$CONFIG_AUX_DIR" ]; then
message "Warning: cannot register $THIS_PACKAGE package as an owner of" \
- "$SERVER_SYMLINK or $XF86CONFIG; $CHECKSUM_DIR exists but is not" \
- "a directory."
+ "$SERVER_SYMLINK or $XF86CONFIG; $CONFIG_AUX_DIR exists but is" \
+ "not a directory."
fi
fi
Modified: trunk/debian/xserver-xfree86.postrm.in
===================================================================
--- trunk/debian/xserver-xfree86.postrm.in 2003-08-24 01:52:17 UTC (rev 423)
+++ trunk/debian/xserver-xfree86.postrm.in 2003-08-24 02:17:28 UTC (rev 424)
@@ -16,11 +16,11 @@
SERVER_SYMLINK=/etc/X11/X
XF86CONFIG=/etc/X11/XF86Config-4
-CHECKSUM_DIR=/var/lib/xfree86
-SERVER_SYMLINK_CHECKSUM="$CHECKSUM_DIR/$(basename "$SERVER_SYMLINK").md5sum"
-SERVER_SYMLINK_ROSTER="$CHECKSUM_DIR/$(basename "$SERVER_SYMLINK").roster"
-XF86CONFIG_CHECKSUM="$CHECKSUM_DIR/$(basename "$XF86CONFIG").md5sum"
-XF86CONFIG_ROSTER="$CHECKSUM_DIR/$(basename "$XF86CONFIG").roster"
+CONFIG_AUX_DIR=/var/lib/xfree86
+SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$SERVER_SYMLINK").md5sum"
+SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/$(basename "$SERVER_SYMLINK").roster"
+XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$XF86CONFIG").md5sum"
+XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/$(basename "$XF86CONFIG").roster"
THIS_SERVER=/usr/bin/X11/XFree86
# clean up non-conffile configuration files and related materials on purge
@@ -93,7 +93,7 @@
fi
fi
- for DIR in /etc/X11 "$CHECKSUM_DIR"; do
+ for DIR in /etc/X11 "$CONFIG_AUX_DIR"; do
rmdir "$DIR" 2> /dev/null || true
done
fi
Modified: trunk/debian/xserver-xfree86.preinst.in
===================================================================
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-24 01:52:17 UTC (rev 423)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-08-24 02:17:28 UTC (rev 424)
@@ -18,9 +18,9 @@
SERVER_SYMLINK=/etc/X11/X
XF86CONFIG=/etc/X11/XF86Config-4
-CHECKSUM_DIR=/var/lib/xfree86
-SERVER_SYMLINK_CHECKSUM="$CHECKSUM_DIR/$(basename "$SERVER_SYMLINK").md5sum"
-XF86CONFIG_CHECKSUM="$CHECKSUM_DIR/$(basename "$XF86CONFIG").md5sum"
+CONFIG_AUX_DIR=/var/lib/xfree86
+SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$SERVER_SYMLINK").md5sum"
+XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$XF86CONFIG").md5sum"
THIS_SERVER=/usr/bin/X11/XFree86
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
@@ -32,11 +32,11 @@
# this is the preinst, so our checksum directory might not have been
# unpacked yet (in fact, if we're upgrading from < 4.2.1-10, we expect
# it not to be)
- if [ ! -e "$CHECKSUM_DIR" ]; then
- mkdir --mode=755 "$CHECKSUM_DIR"
+ if [ ! -e "$CONFIG_AUX_DIR" ]; then
+ mkdir --mode=755 "$CONFIG_AUX_DIR"
else
# checksum pathname exists; only proceed if it is a directory
- if [ -d "$CHECKSUM_DIR" ]; then
+ if [ -d "$CONFIG_AUX_DIR" ]; then
# first, migrate the X server symlink
if [ -e "$SERVER_SYMLINK" ]; then
@@ -88,7 +88,7 @@
# the checksum pathname does exist but is not a directory; we assume
# the user has reasons for setting things up this way
message "Warning: cannot store MD5 checksums of $THIS_PACKAGE's" \
- "configuration files; $CHECKSUM_DIR exists but is not a" \
+ "configuration files; $CONFIG_AUX_DIR exists but is not a" \
"directory."
fi
fi
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
