X Strike Force X.Org X11 SVN commit: r1962 - in trunk/font/font-util-X11R7.0-1.0.0/debian: . local
Author: dnusinow
Date: 2006-04-24 22:59:05 -0400 (Mon, 24 Apr 2006)
New Revision: 1962
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:
* Make -7 the default on all update-fonts* scripts. Thanks Russ Allbery.
(closes: 363005)
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 01:31:46 UTC (rev 1961)
+++ trunk/font/font-util-X11R7.0-1.0.0/debian/changelog 2006-04-25 02:59:05 UTC (rev 1962)
@@ -1,3 +1,10 @@
+xfonts-utils (1:1.0.0-3) experimental; urgency=low
+
+ * Make -7 the default on all update-fonts* scripts. Thanks Russ Allbery.
+ (closes: 363005)
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 24 Apr 2006 22:58:33 -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 01:31:46 UTC (rev 1961)
+++ trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-alias 2006-04-25 02:59:05 UTC (rev 1962)
@@ -44,6 +44,7 @@
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
@@ -51,11 +52,12 @@
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
+ -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
EOF
}
-X11R7_LAYOUT=
+X11R7_LAYOUT=true
# Validate arguments.
case "$1" in
@@ -67,6 +69,10 @@
X11R7_LAYOUT=true
shift
;;
+ -6|--x11r6-layout)
+ X11R7_LAYOUT=
+ shift
+ ;;
esac
case "$1" in
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 01:31:46 UTC (rev 1961)
+++ trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-dir 2006-04-25 02:59:05 UTC (rev 1962)
@@ -45,6 +45,7 @@
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
@@ -53,10 +54,11 @@
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=
+X11R7_LAYOUT=true
# Validate arguments.
case "$1" in
@@ -68,6 +70,10 @@
X11R7_LAYOUT=true
shift
;;
+ -6|--x11r6-layout)
+ X11R6_LAYOUT=
+ shift
+ ;;
esac
case "$1" in
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 01:31:46 UTC (rev 1961)
+++ trunk/font/font-util-X11R7.0-1.0.0/debian/local/update-fonts-scale 2006-04-25 02:59:05 UTC (rev 1962)
@@ -51,6 +51,7 @@
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
@@ -59,6 +60,7 @@
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
}
@@ -74,6 +76,10 @@
X11R7_LAYOUT=true
shift
;;
+ -6|--x11r6-layout)
+ X11R6_LAYOUT=
+ shift
+ ;;
esac
case "$1" in
Reply to: