Author: dnusinow
Date: 2006-04-24 23:03:22 -0400 (Mon, 24 Apr 2006)
New Revision: 1963
Modified:
trunk/font/font-util-X11R7.0-1.0.0/debian/changelog
trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias
trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir
trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale
Log:
* Get rid of /etc/X11/fonts/X11R7/* for the aliases. Just put them in
/etc/X11/fonts like before. Thanks Steve Langasek and Eugene Konev.
Modified: trunk/font/font-util-X11R7.0-1.0.0/debian/changelog
===================================================================
--- trunk/font/font-util-X11R7.0-1.0.0/debian/changelog 2006-04-25 02:59:05 UTC
(rev 1962)
+++ trunk/font/font-util-X11R7.0-1.0.0/debian/changelog 2006-04-25 03:03:22 UTC
(rev 1963)
@@ -2,8 +2,10 @@
* Make -7 the default on all update-fonts* scripts. Thanks Russ Allbery.
(closes: 363005)
+ * Get rid of /etc/X11/fonts/X11R7/* for the aliases. Just put them in
+ /etc/X11/fonts like before. Thanks Steve Langasek and Eugene Konev.
- -- David Nusinow <[EMAIL PROTECTED]> Mon, 24 Apr 2006 22:58:33 -0400
+ -- David Nusinow <[EMAIL PROTECTED]> Mon, 24 Apr 2006 23:03:15 -0400
xfonts-utils (1:1.0.0-2) experimental; urgency=low
Modified: trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias
===================================================================
--- trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias
2006-04-25 02:59:05 UTC (rev 1962)
+++ trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias
2006-04-25 03:03:22 UTC (rev 1963)
@@ -92,11 +92,7 @@
if expr "$1" : "/.*" >/dev/null 2>&1; then
# Yes; an absolute path to an X font directory was provided.
XDIR=$1
- if [ -n "$X11R7_LAYOUT" ]; then
- ETCDIR=/etc/X11/fonts/X11R7/${XDIR##*/}
- else
- ETCDIR=/etc/X11/fonts/${XDIR##*/}
- fi
+ ETCDIR=/etc/X11/fonts/${XDIR##*/}
if [ "$XDIR" = "$ETCDIR" ]; then
# We were given an /etc directory as an argument.
die "path to X font directory must be used"
@@ -106,12 +102,11 @@
else
# No; a relative path was provided -- assume we were given just the
# basename.
+ ETCDIR=/etc/X11/fonts/$1
if [ -n "$X11R7_LAYOUT" ]; then
XDIR=/usr/share/fonts/X11/$1
- ETCDIR=/etc/X11/fonts/X11R7/$1
else
XDIR=/usr/lib/X11/fonts/$1
- ETCDIR=/etc/X11/fonts/$1
fi
fi
# Confirm that the directories to be operated on exist.
Modified: trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir
===================================================================
--- trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir
2006-04-25 02:59:05 UTC (rev 1962)
+++ trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir
2006-04-25 03:03:22 UTC (rev 1963)
@@ -94,11 +94,7 @@
if expr "$1" : "/.*" >/dev/null 2>&1; then
# Yes; an absolute path to an X font directory was provided.
XDIR=$1
- if [ -n "$X11R7_LAYOUT" ]; then
- ETCDIR=/etc/X11/fonts/X11R7/${XDIR##*/}
- else
- ETCDIR=/etc/X11/fonts/${XDIR##*/}
- fi
+ ETCDIR=/etc/X11/fonts/${XDIR##*/}
if [ "$XDIR" = "$ETCDIR" ]; then
# We were given an /etc directory as an argument.
die "path to X font directory must be used"
Modified: trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale
===================================================================
--- trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale
2006-04-25 02:59:05 UTC (rev 1962)
+++ trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale
2006-04-25 03:03:22 UTC (rev 1963)
@@ -99,11 +99,7 @@
if expr "$1" : "/.*" >/dev/null 2>&1; then
# Yes; an absolute path to an X font directory was provided.
XDIR=$1
- if [ -n "$X11R7_LAYOUT" ]; then
- ETCDIR=/etc/X11/fonts/X11R7/${XDIR##*/}
- else
- ETCDIR=/etc/X11/fonts/${XDIR##*/}
- fi
+ ETCDIR=/etc/X11/fonts/${XDIR##*/}
if [ "$XDIR" = "$ETCDIR" ]; then
# We were given an /etc directory as an argument.
die "path to X font directory must be used"
@@ -113,12 +109,11 @@
else
# No; a relative path was provided -- assume we were given just the
# basename.
+ ETCDIR=/etc/X11/fonts/$1
if [ -n "$X11R7_LAYOUT" ]; then
XDIR=/usr/share/fonts/X11/$1
- ETCDIR=/etc/X11/fonts/X11R7/$1
else
XDIR=/usr/lib/X11/fonts/$1
- ETCDIR=/etc/X11/fonts/$1
fi
fi
# Confirm that the directories to be operated on exist.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
