X Strike Force SVN commit: rev 511 - trunk/debian
Author: branden
Date: 2003-09-12 09:03:11 -0500 (Fri, 12 Sep 2003)
New Revision: 511
Modified:
trunk/debian/changelog
trunk/debian/xdm.postinst.in
trunk/debian/xdm.postrm.in
trunk/debian/xdm.preinst.in
Log:
debian/xdm.{preinst,postinst,postrm}:
+ add debugging messages for tracing of various operations
+ move repair of ancient malformed K* links in /etc/rc[016].d from
postinst to preinst
debian/xdm.preinst.in:
+ restore removal of /usr/X11R6/lib/libXdmGreet.so and explain why in
comment
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-09-12 13:53:03 UTC (rev 510)
+++ trunk/debian/changelog 2003-09-12 14:03:11 UTC (rev 511)
@@ -115,7 +115,9 @@
+ quote shell variables where reasonable to do so
+ don't do things that depend on the value of $RET after a db_* if a
null value doesn't make sense
- + wrap long lines at 80 columns
+ + add debugging messages for tracing of various operations
+ + move repair of ancient malformed K* links in /etc/rc[016].d from
+ postinst to preinst
- debian/xdm.config.in:
+ debconf is not a registry; use the basename of the path listed in
/etc/X11/default-display-manager as the default answer to the
@@ -142,7 +144,7 @@
+ move removal of long-obsoleted /etc/X11/window-managers file from
postinst to preinst
- debian/xfree86-common.config.in:
- + wrap db_* commands with safe_debconf
+ + wrap bare db_* commands with safe_debconf()
- debian/xfree86-common.preinst.in:
+ Stop removing /usr/doc/X11 and /usr/X11R6/lib/X11/doc symlinks; after
taking a look at old xfree86 package releases (potato, slink, hamm),
@@ -152,7 +154,7 @@
+ conditionalize removal of long-obsoleted /etc/X11/window-managers file
on upgrades/installs over xfree86-common 3.3.6-5
- -- Branden Robinson <branden@debian.org> Thu, 11 Sep 2003 20:21:05 -0500
+ -- Branden Robinson <branden@debian.org> Fri, 12 Sep 2003 08:59:31 -0500
xfree86 (4.2.1-11) unstable; urgency=medium
Modified: trunk/debian/xdm.postinst.in
===================================================================
--- trunk/debian/xdm.postinst.in 2003-09-12 13:53:03 UTC (rev 510)
+++ trunk/debian/xdm.postinst.in 2003-09-12 14:03:11 UTC (rev 511)
@@ -26,16 +26,10 @@
# 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"
remove_conffile_commit "$F"
done
-# deal with a bug in very old versions of xbase
-for DIR in rc0.d rc1.d rc6.d; do
- if [ -L /etc/$DIR/K1xdm ]; then
- mv /etc/$DIR/K1xdm /etc/$DIR/K01xdm
- fi
-done
-
# debconf is not a registry, so we only fiddle with the default file if it
# does not exist
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
Modified: trunk/debian/xdm.postrm.in
===================================================================
--- trunk/debian/xdm.postrm.in 2003-09-12 13:53:03 UTC (rev 510)
+++ trunk/debian/xdm.postrm.in 2003-09-12 14:03:11 UTC (rev 511)
@@ -23,6 +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"
remove_conffile_rollback "$F"
done
fi
Modified: trunk/debian/xdm.preinst.in
===================================================================
--- trunk/debian/xdm.preinst.in 2003-09-12 13:53:03 UTC (rev 510)
+++ trunk/debian/xdm.preinst.in 2003-09-12 14:03:11 UTC (rev 511)
@@ -15,12 +15,22 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
+ # deal with a bug in very old versions of xbase (prior to 3.3.2-1)
+ 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"
+ mv "/etc/$DIR/K1xdm" "/etc/$DIR/K01xdm"
+ fi
+ done
+ fi
+
# as of the xfree86 4.x packages, we expect /usr/X11R6/lib/X11/xdm to be a
# symbolic link to the /etc/X11/xdm directory; move an existing directory out
# 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
- message "Note: Removing obsolete /usr/X11R6/lib/X11/xdm directory."
+ debugmsg "removing obsolete /usr/X11R6/lib/X11/xdm directory"
mv /usr/X11R6/lib/X11/xdm /usr/X11R6/lib/X11/xdm.moved-by-preinst
fi
@@ -28,12 +38,17 @@
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"
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
fi
fi
# 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"
remove_conffile_prepare /etc/X11/xdm/Xreset d65cd850f647f7f3d6a076273a3bbb1f
remove_conffile_prepare /etc/X11/xdm/Xsetup 9e68b23946b72af86f88593394ba9339
fi
Reply to: