X Strike Force X.Org X11 SVN commit: r1964 - in trunk/font/font-util-X11R7.0-1.0.0/debian: . local
Author: dnusinow
Date: 2006-04-24 23:24:02 -0400 (Mon, 24 Apr 2006)
New Revision: 1964
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:
Revert the last two commits. I don't see a cleaner way to do this than what we've currently got, so let's just stick with it for now
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 03:03:22 UTC (rev 1963)
+++ trunk/font/font-util-X11R7.0-1.0.0/debian/changelog 2006-04-25 03:24:02 UTC (rev 1964)
@@ -1,12 +1,3 @@
-xfonts-utils (1:1.0.0-3) experimental; urgency=low
-
- * 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 <dnusinow@debian.org> Mon, 24 Apr 2006 23:03:15 -0400
-
xfonts-utils (1:1.0.0-2) experimental; urgency=low
* Install the various update-fonts* apps to /usr/sbin instead of /usr/bin.
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 03:03:22 UTC (rev 1963)
+++ trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias 2006-04-25 03:24:02 UTC (rev 1964)
@@ -44,7 +44,6 @@
cat <<EOF
Usage: $PROGNAME DIRECTORY ...
$PROGNAME { -7 | --x11r7-layout } DIRECTORY ...
- $PROGNAME { -6 | --x11r6-layout } DIRECTORY ...
$PROGNAME { -h | --help }
This program combines X font alias information from several packages into a
single file that is placed in each specified X font directory DIRECTORY. This
@@ -52,12 +51,11 @@
update-fonts-alias(8) for more information.
Options:
-h, --help display this usage message and exit
- -7, --x11r7-layout use new font layout introduced with X11R7 (this is enabled by default)
- -6, --x11r6-layout use the old font layout from X11R6
+ -7, --x11r7-layout use new font layout introduced with X11R7
EOF
}
-X11R7_LAYOUT=true
+X11R7_LAYOUT=
# Validate arguments.
case "$1" in
@@ -69,10 +67,6 @@
X11R7_LAYOUT=true
shift
;;
- -6|--x11r6-layout)
- X11R7_LAYOUT=
- shift
- ;;
esac
case "$1" in
@@ -92,7 +86,11 @@
if expr "$1" : "/.*" >/dev/null 2>&1; then
# Yes; an absolute path to an X font directory was provided.
XDIR=$1
- ETCDIR=/etc/X11/fonts/${XDIR##*/}
+ if [ -n "$X11R7_LAYOUT" ]; then
+ ETCDIR=/etc/X11/fonts/X11R7/${XDIR##*/}
+ else
+ ETCDIR=/etc/X11/fonts/${XDIR##*/}
+ fi
if [ "$XDIR" = "$ETCDIR" ]; then
# We were given an /etc directory as an argument.
die "path to X font directory must be used"
@@ -102,11 +100,12 @@
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 03:03:22 UTC (rev 1963)
+++ trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir 2006-04-25 03:24:02 UTC (rev 1964)
@@ -45,7 +45,6 @@
cat <<EOF
Usage: $PROGNAME DIRECTORY ...
$PROGNAME { -7 | --x11r7-layout } DIRECTORY ...
- $PROGNAME { -6 | --x11r6-layout } DIRECTORY ...
$PROGNAME { -h | --help }
This program combines X font alias information from several packages into a
single file that is placed in each specified X font directory DIRECTORY. This
@@ -54,11 +53,10 @@
Options:
-h, --help display this usage message and exit
-7, --x11r7-layout use new font layout introduced with X11R7
- -6, --x11r6-layout use old font layout from X11R6
EOF
}
-X11R7_LAYOUT=true
+X11R7_LAYOUT=
# Validate arguments.
case "$1" in
@@ -70,10 +68,6 @@
X11R7_LAYOUT=true
shift
;;
- -6|--x11r6-layout)
- X11R6_LAYOUT=
- shift
- ;;
esac
case "$1" in
@@ -94,7 +88,11 @@
if expr "$1" : "/.*" >/dev/null 2>&1; then
# Yes; an absolute path to an X font directory was provided.
XDIR=$1
- ETCDIR=/etc/X11/fonts/${XDIR##*/}
+ if [ -n "$X11R7_LAYOUT" ]; then
+ ETCDIR=/etc/X11/fonts/X11R7/${XDIR##*/}
+ else
+ ETCDIR=/etc/X11/fonts/${XDIR##*/}
+ fi
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 03:03:22 UTC (rev 1963)
+++ trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale 2006-04-25 03:24:02 UTC (rev 1964)
@@ -51,7 +51,6 @@
cat <<EOF
Usage: $PROGNAME DIRECTORY ...
$PROGNAME { -7 | --x11r7-layout } DIRECTORY ...
- $PROGNAME { -6 | --x11r6-layout } DIRECTORY ...
$PROGNAME { -h | --help }
This program combines scalable X font information from several packages into a
single file that is placed in each specified X font directory DIRECTORY. This
@@ -60,7 +59,6 @@
Options:
-h, --help display this usage message and exit
-7, --x11r7-layout use new font layout introduced with X11R7
- -6, --x11r6-layout use old font layout from X11R6
EOF
}
@@ -76,10 +74,6 @@
X11R7_LAYOUT=true
shift
;;
- -6|--x11r6-layout)
- X11R6_LAYOUT=
- shift
- ;;
esac
case "$1" in
@@ -99,7 +93,11 @@
if expr "$1" : "/.*" >/dev/null 2>&1; then
# Yes; an absolute path to an X font directory was provided.
XDIR=$1
- ETCDIR=/etc/X11/fonts/${XDIR##*/}
+ if [ -n "$X11R7_LAYOUT" ]; then
+ ETCDIR=/etc/X11/fonts/X11R7/${XDIR##*/}
+ else
+ ETCDIR=/etc/X11/fonts/${XDIR##*/}
+ fi
if [ "$XDIR" = "$ETCDIR" ]; then
# We were given an /etc directory as an argument.
die "path to X font directory must be used"
@@ -109,11 +107,12 @@
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.
Reply to: