Author: branden
Date: 2003-10-03 02:40:59 -0500 (Fri, 03 Oct 2003)
New Revision: 625
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/xlibs.preinst.in
Log:
Merge changes from revision 624 on trunk (4.2.1-12.1 NMU).
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-10-03 07:34:02 UTC (rev 624)
+++ branches/4.3.0/sid/debian/changelog 2003-10-03 07:40:59 UTC (rev 625)
@@ -374,6 +374,12 @@
-- Branden Robinson <[EMAIL PROTECTED]> Thu, 26 Jun 2003 10:14:27 -0500
+xfree86 (4.2.1-12.1) unstable; urgency=low
+
+ * Fix typo in xlibs preinst. Closes: #213774, #213776
+
+ -- LaMont Jones <[EMAIL PROTECTED]> Thu, 2 Oct 2003 10:07:11 -0600
+
xfree86 (4.2.1-12) unstable; urgency=high
* urgency high due to security fix for font service integer overflow attacks
Modified: branches/4.3.0/sid/debian/xlibs.preinst.in
===================================================================
--- branches/4.3.0/sid/debian/xlibs.preinst.in 2003-10-03 07:34:02 UTC (rev 624)
+++ branches/4.3.0/sid/debian/xlibs.preinst.in 2003-10-03 07:40:59 UTC (rev 625)
@@ -21,19 +21,17 @@
fi
done
- # ensure the sanity of the app-defaults symlink in /usr; the xlibs postinst
- # script in woody could make it insane
- for DIR in /usr/X11R6/lib/X11/app-defaults /etc/X11/app-defaults; do
- LINK="$DIR/app-defaults"
- if [ -L "$LINK" ]; then
- debug "Removing bogus symbolic link $LINK."
- rm -f "$LINK"
- fi
- done
-
check_symlinks_and_warn /usr/X11R6/lib/X11/xkb \
/usr/X11R6/lib/X11/app-defaults
+ # ensure the sanity of the app-defaults symlink; the xlibs postinst script in
+ # woody could make it insane
+ LINK="/etc/X11/app-defaults/app-defaults"
+ if [ -L "$LINK" ]; then
+ debugmsg "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."
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
