X Strike Force X.Org X11 SVN commit: r1255 - in branches/modular/font/font-util-X11R7.0-1.0.0/debian: . local
Author: dnusinow
Date: 2006-02-20 20:20:48 -0500 (Mon, 20 Feb 2006)
New Revision: 1255
Modified:
branches/modular/font/font-util-X11R7.0-1.0.0/debian/control
branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias
branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias.8
branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir
branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir.8
branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale
branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale.8
Log:
Apply Eugene Konev's updates for the update-fonts* tools to let them install properly. The manpage isn't done, but I can live with that
Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/control
===================================================================
--- branches/modular/font/font-util-X11R7.0-1.0.0/debian/control 2006-02-21 01:19:55 UTC (rev 1254)
+++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/control 2006-02-21 01:20:48 UTC (rev 1255)
@@ -8,8 +8,8 @@
Package: xfonts-utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
-Replaces: xutils (<< 1:1.0.1-2)
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-encodings
+Replaces: xutils (<< 1:1.0.1-1)
Description: X Window System font utility programs
xfonts-utils provides a set of utility programs shipped with the X Window
System that are needed for font management.
Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias
===================================================================
--- branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias 2006-02-21 01:19:55 UTC (rev 1254)
+++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias 2006-02-21 01:20:48 UTC (rev 1255)
@@ -43,22 +43,33 @@
fi
cat <<EOF
Usage: $PROGNAME DIRECTORY ...
+ $PROGNAME { -7 | --x11r7-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
utility is primarily useful to Debian package maintainer scripts. See
update-fonts-alias(8) for more information.
Options:
- -h, --help display this usage message and exit
+ -h, --help display this usage message and exit
+ -7, --x11r7-layout use new font layout introduced with X11R7
EOF
}
+X11R7_LAYOUT=
+
# Validate arguments.
case "$1" in
-h|--help)
usage
exit 0
;;
+ -7|--x11r7-layout)
+ X11R7_LAYOUT=true
+ shift
+ ;;
+esac
+
+case "$1" in
-*)
usage "unrecognized option" >&2
exit 2
@@ -75,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"
@@ -85,8 +100,13 @@
else
# No; a relative path was provided -- assume we were given just the
# basename.
- XDIR=/usr/lib/X11/fonts/$1
- 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.
for DIR in "$XDIR" "$ETCDIR"; do
Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias.8
===================================================================
--- branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias.8 2006-02-21 01:19:55 UTC (rev 1254)
+++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias.8 2006-02-21 01:20:48 UTC (rev 1255)
@@ -29,6 +29,7 @@
update\-fonts\-alias \- compile fonts.alias files
.SH SYNOPSIS
.B update\-fonts\-alias
+[\fIOPTION\fR]
.I directory ...
.SH DESCRIPTION
.B update\-fonts\-alias
@@ -49,8 +50,10 @@
which is simply the last component of its path (such as \(oq75dpi\(cq or
\(oqmisc\(cq),
.B update\-fonts\-alias
-will assemble
+will assemble either
.IR /usr/lib/X11/fonts/ directory /fonts.alias
+or
+.IR /usr/share/fonts/X11/ directory /fonts.alias
from the files found in
.IR /etc/X11/fonts/ directory / package .alias .
.PP
@@ -89,6 +92,12 @@
.SH OPTIONS
.B \-h\fR, \fB\-\-help
displays a brief usage message and exits.
+.PP
+.B \-7\fR, \fB\-\-r7\-layout
+switches the font layout to the one introduced in X11R7: fonts in
+.IR /usr/share/fonts/X11/ directory
+(default is: fonts in
+.IR /usr/lib/X11/fonts/ directory)
.SH OPERANDS
.B update\-fonts\-alias
takes one or more X font directory names to operate on as operands.
@@ -155,7 +164,7 @@
was invoked with invalid arguments.
.SH BUGS
See
-.URL "http://bugs.debian.org/xbase\-clients"; "the Debian Bug Tracking System" .
+.URL "http://bugs.debian.org/xfonts\-utils"; "the Debian Bug Tracking System" .
If you wish to report a bug in
.BR update\-fonts\-alias ,
please see
Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir
===================================================================
--- branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir 2006-02-21 01:19:55 UTC (rev 1254)
+++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir 2006-02-21 01:20:48 UTC (rev 1255)
@@ -10,8 +10,7 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
PROGNAME=${0##*/}
-ENCDIR=/usr/X11R6/lib/X11/fonts/encodings
-PATH=/usr/bin/X11:$PATH
+ENCDIR=/usr/share/fonts/X11/encodings
# Query the terminal to establish a default number of columns to use for
# displaying messages to the user. This is used only as a fallback in the event
@@ -45,26 +44,40 @@
fi
cat <<EOF
Usage: $PROGNAME DIRECTORY ...
+ $PROGNAME { -7 | --x11r7-layout } DIRECTORY ...
$PROGNAME { -h | --help }
-This program is a wrapper for mkfontdir(1x) that is primarily useful to Debian
-package maintainer scripts. See update-fonts-dir(8) for more information.
+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
+utility is primarily useful to Debian package maintainer scripts. See
+update-fonts-dir(8) for more information.
Options:
- -h, --help display this usage message and exit
+ -h, --help display this usage message and exit
+ -7, --x11r7-layout use new font layout introduced with X11R7
EOF
}
+X11R7_LAYOUT=
+
# Validate arguments.
case "$1" in
-h|--help)
usage
exit 0
;;
+ -7|--x11r7-layout)
+ R7_LAYOUT=true
+ shift
+ ;;
+esac
+
+case "$1" in
-*)
usage "unrecognized option" >&2
exit 2
;;
esac
+
if [ $# -eq 0 ]; then
usage "one or more font directories must be specified" >&2
exit 2
@@ -75,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"
@@ -85,7 +102,11 @@
else
# No; a relative path was provided -- assume we were given just the
# basename.
- XDIR=/usr/lib/X11/fonts/$1
+ if [ -n "$X11R7_LAYOUT" ]; then
+ XDIR=/usr/share/fonts/X11/$1
+ else
+ XDIR=/usr/lib/X11/fonts/$1
+ fi
fi
# Confirm that the directories to be operated on exist.
VALID=yes
Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir.8
===================================================================
--- branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir.8 2006-02-21 01:19:55 UTC (rev 1254)
+++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir.8 2006-02-21 01:20:48 UTC (rev 1255)
@@ -29,6 +29,7 @@
update\-fonts\-dir \- compile fonts.dir files
.SH SYNOPSIS
.B update\-fonts\-dir
+[\fIOPTION\fR]
.I directory ...
.SH DESCRIPTION
.B update\-fonts\-dir
@@ -49,8 +50,10 @@
which is simply the last component of its path (such as \(oq75dpi\(cq or
\(oqmisc\(cq),
.B update\-fonts\-dir
-will generate
+will generate either
.IR /usr/lib/X11/fonts/ directory /fonts.dir
+or
+.IR /usr/share/fonts/X11/ directory /fonts.dir
from the
.I fonts.scale
and font files found within it.
@@ -85,6 +88,12 @@
.SH OPTIONS
.B \-h\fR, \fB\-\-help
displays a brief usage message and exits.
+.PP
+.B \-7\fR, \fB\-\-r7\-layout
+switches the font layout to the one introduced in X11R7: fonts in
+.IR /usr/share/fonts/X11/ directory
+(default is: fonts in
+.IR /usr/lib/X11/fonts/ directory)
.SH OPERANDS
.B update\-fonts\-dir
takes one or more X font directory names to operate on as operands.
@@ -151,7 +160,7 @@
was invoked with invalid arguments.
.SH BUGS
See
-.URL "http://bugs.debian.org/xbase\-clients"; "the Debian Bug Tracking System" .
+.URL "http://bugs.debian.org/xfonts\-utils"; "the Debian Bug Tracking System" .
If you wish to report a bug in
.BR update\-fonts\-dir ,
please see
Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale
===================================================================
--- branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale 2006-02-21 01:19:55 UTC (rev 1254)
+++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale 2006-02-21 01:20:48 UTC (rev 1255)
@@ -50,22 +50,33 @@
fi
cat <<EOF
Usage: $PROGNAME DIRECTORY ...
+ $PROGNAME { -7 | --x11r7-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
utility is primarily useful to Debian package maintainer scripts. See
update-fonts-scale(8) for more information.
Options:
- -h, --help display this usage message and exit
+ -h, --help display this usage message and exit
+ -7, --x11r7-layout use new font layout introduced with X11R7
EOF
}
+X11R7_LAYOUT=
+
# Validate arguments.
case "$1" in
-h|--help)
usage
exit 0
;;
+ -7|--x11r7-layout)
+ X11R7_LAYOUT=true
+ shift
+ ;;
+esac
+
+case "$1" in
-*)
usage "unrecognized option" >&2
exit 2
@@ -82,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"
@@ -92,8 +107,13 @@
else
# No; a relative path was provided -- assume we were given just the
# basename.
- XDIR=/usr/lib/X11/fonts/$1
- 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.
for DIR in "$XDIR" "$ETCDIR"; do
Modified: branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale.8
===================================================================
--- branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale.8 2006-02-21 01:19:55 UTC (rev 1254)
+++ branches/modular/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale.8 2006-02-21 01:20:48 UTC (rev 1255)
@@ -29,6 +29,7 @@
update\-fonts\-scale \- generate fonts.scale files
.SH SYNOPSIS
.B update\-fonts\-scale
+[\fIOPTION\fR]
.I directory ...
.SH DESCRIPTION
.B update\-fonts\-scale
@@ -49,8 +50,10 @@
simply the last component of its path (such as \(oq75dpi\(cq or
\(oqmisc\(cq),
.B update\-fonts\-scale
-will assemble
+will assemble either
.IR /usr/lib/X11/fonts/ directory /fonts.scale
+or
+.IR /usr/share/fonts/X11/ directory /fonts.scale
from the index files found at
.IR /etc/X11/fonts/ directory / package .scale ,
where
@@ -93,6 +96,12 @@
.SH OPTIONS
.B \-h\fR, \fB\-\-help
displays a brief usage message and exits.
+.PP
+.B \-7\fR, \fB\-\-r7\-layout
+switches the font layout to the one introduced in X11R7: fonts in
+.IR /usr/share/fonts/X11/ directory
+(default is: fonts in
+.IR /usr/lib/X11/fonts/ directory)
.SH OPERANDS
.B update\-fonts\-scale
takes one or more X font directory names to operate on as operands.
@@ -179,7 +188,7 @@
was invoked with invalid arguments.
.SH BUGS
See
-.URL "http://bugs.debian.org/xbase\-clients"; "the Debian Bug Tracking System" .
+.URL "http://bugs.debian.org/xfonts\-utils"; "the Debian Bug Tracking System" .
If you wish to report a bug in
.BR update\-fonts\-scale ,
please see
Reply to: