Author: branden
Date: 2003-10-03 02:34:02 -0500 (Fri, 03 Oct 2003)
New Revision: 624
Modified:
trunk/debian/changelog
trunk/debian/xlibs.preinst.in
Log:
Integrate changes from LaMont Jones's NMU.
Un-hork busted logic that used a non-existent shell function to tell the
user about how we're fixing the insane old app-defaults symlink. Also
clean up logic for less redundancy.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-10-03 06:25:23 UTC (rev 623)
+++ trunk/debian/changelog 2003-10-03 07:34:02 UTC (rev 624)
@@ -1,3 +1,15 @@
+xfree86 (4.2.1-13) unstable; urgency=low
+
+ * Acknowledge bugs fixed in NMU. Thanks, LaMont! (Closes: #213774)
+
+ -- Branden Robinson <[EMAIL PROTECTED]> Fri, 3 Oct 2003 02:29:29 -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: trunk/debian/xlibs.preinst.in
===================================================================
--- trunk/debian/xlibs.preinst.in 2003-10-03 06:25:23 UTC (rev 623)
+++ trunk/debian/xlibs.preinst.in 2003-10-03 07:34:02 UTC (rev 624)
@@ -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."
