X Strike Force XFree86 SVN commit: rev 647 - trunk/debian
Author: branden
Date: 2003-10-09 15:31:16 -0500 (Thu, 09 Oct 2003)
New Revision: 647
Modified:
trunk/debian/changelog
trunk/debian/shell-lib.sh
Log:
Fix font_update() to *really* ignore requests to run xftcache on the
Speedo directory. The previous attempt at a fix (in -12) was
unsuccessful. Thanks to "Jack.R" for his assistance and patience in
tracking down the problem. (Closes: #192138)
- debian/shell-lib.sh
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-10-09 20:21:35 UTC (rev 646)
+++ trunk/debian/changelog 2003-10-09 20:31:16 UTC (rev 647)
@@ -41,6 +41,12 @@
configuration file from the xserver-xfree86 pre-installation script.
- debian/xserver-xfree86.preinst.in
+ * Fix font_update() to *really* ignore requests to run xftcache on the
+ Speedo directory. The previous attempt at a fix (in -12) was
+ unsuccessful. Thanks to "Jack.R" for his assistance and patience in
+ tracking down the problem. (Closes: #192138)
+ - debian/shell-lib.sh
+
-- Branden Robinson <branden@debian.org> Wed, 8 Oct 2003 23:23:24 -0500
xfree86 (4.2.1-12.1) unstable; urgency=low
Modified: trunk/debian/shell-lib.sh
===================================================================
--- trunk/debian/shell-lib.sh 2003-10-09 20:21:35 UTC (rev 646)
+++ trunk/debian/shell-lib.sh 2003-10-09 20:31:16 UTC (rev 647)
@@ -294,17 +294,17 @@
if which $CMD > /dev/null 2>&1; then
SHORTCMD=$(basename $CMD)
message_nonl "Running $SHORTCMD in $DIR font directory..."
- # KLUDGE: xftcache dies anyway in XFree86 4.3.0
if [ "$SHORTCMD" = "xftcache" ]; then
+ if [ "$DIR" = "Speedo" ]; then
+ # do nothing; xftcache SEGVs (*sometimes*) when asked to process the
+ # Speedo directory
+ CMD=:
+ fi
+ # KLUDGE: xftcache needs to be handed the full path; the command goes
+ # away anyway in XFree86 4.3.0
DIR=/usr/X11R6/lib/X11/fonts/$DIR
fi
- if [ "$SHORTCMD" = "xftcache" -a "$DIR" = "Speedo" ]; then
- # do nothing; xftcache SEGVs (*sometimes*) when asked to process the
- # Speedo directory
- :
- else
- $CMD $DIR
- fi
+ $CMD $DIR
message "done."
else
message "Note: $CMD not found; not updating $DIR font directory data."
Reply to: