xfonts-utils: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/local/update-fonts-alias | 7 +++----
debian/local/update-fonts-dir | 2 +-
debian/local/update-fonts-scale | 7 +++----
4 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 0c226357e648fbace0cd85daadfbe5577c74e2e8
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 30 16:09:22 2007 +0200
* update-fonts-{alias,dir,scale}: stop messing with X11R6 dirs
(closes: #389085).
diff --git a/debian/changelog b/debian/changelog
index 094654e..6c6262a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-utils (1:1.0.1-2) UNRELEASED; urgency=low
+
+ * update-fonts-{alias,dir,scale}: stop messing with X11R6 dirs
+ (closes: #389085).
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 30 Mar 2007 16:08:45 +0200
+
xfonts-utils (1:1.0.1-1) unstable; urgency=low
* Internal directory name cleanup. This requires a new .orig.tar.gz for
diff --git a/debian/local/update-fonts-alias b/debian/local/update-fonts-alias
index ad829df..baf6159 100644
--- a/debian/local/update-fonts-alias
+++ b/debian/local/update-fonts-alias
@@ -96,7 +96,6 @@ while [ -n "$1" ]; do
else
# No; a relative path was provided -- assume we were given just the
# basename.
- X11R6DIR=/usr/lib/X11/fonts/$1
X11R7DIR=/usr/share/fonts/X11/$1
ETCDIR=/etc/X11/fonts/$1
ETC7DIR=/etc/X11/fonts/X11R7/$1
@@ -120,7 +119,7 @@ while [ -n "$1" ]; do
fi
VALIDDEST=
- for DIR in "$X11R7DIR" "$X11R6DIR"; do
+ for DIR in "$X11R7DIR"; do
[ -n "$DIR" ] || continue
if [ -d "$DIR" ]; then
VALIDDEST=yes
@@ -136,7 +135,7 @@ while [ -n "$1" ]; do
# Are there any files to process?
if [ "$(echo "$ETCDIR"/*.alias "$ETC7DIR"/*.alias)" != "$ETCDIR/*.alias $ETC7DIR/*.alias" ]
then
- for XDIR in "$X11R7DIR" "$X11R6DIR"; do
+ for XDIR in "$X11R7DIR"; do
if [ -z "$XDIR" ] || ! [ -d "$XDIR" ]; then
continue
fi
@@ -154,7 +153,7 @@ EOF
mv "$XDIR/fonts.alias.update-new" "$XDIR/fonts.alias"
done
else
- for XDIR in "$X11R7DIR" "$X11R6DIR"; do
+ for XDIR in "$X11R7DIR"; do
if [ -z "$XDIR" ] || ! [ -d "$XDIR" ]; then
continue
fi
diff --git a/debian/local/update-fonts-dir b/debian/local/update-fonts-dir
index 7ccdd36..5a327e7 100644
--- a/debian/local/update-fonts-dir
+++ b/debian/local/update-fonts-dir
@@ -102,7 +102,7 @@ while [ -n "$1" ]; do
else
# No; a relative path was provided -- assume we were given just the
# basename.
- XDIRS="/usr/share/fonts/X11/$1 /usr/lib/X11/fonts/$1"
+ XDIRS="/usr/share/fonts/X11/$1"
fi
# Confirm that the directories to be operated on exist.
for XDIR in $XDIRS; do
diff --git a/debian/local/update-fonts-scale b/debian/local/update-fonts-scale
index 8d6c6f1..01f861c 100644
--- a/debian/local/update-fonts-scale
+++ b/debian/local/update-fonts-scale
@@ -103,7 +103,6 @@ while [ -n "$1" ]; do
else
# No; a relative path was provided -- assume we were given just the
# basename.
- X11R6DIR=/usr/lib/X11/fonts/$1
X11R7DIR=/usr/share/fonts/X11/$1
ETCDIR=/etc/X11/fonts/$1
ETC7DIR=/etc/X11/fonts/X11R7/$1
@@ -127,7 +126,7 @@ while [ -n "$1" ]; do
fi
VALIDDEST=
- for DIR in "$X11R7DIR" "$X11R6DIR"; do
+ for DIR in "$X11R7DIR"; do
[ -n "$DIR" ] || continue
if [ -d "$DIR" ]; then
VALIDDEST=yes
@@ -143,7 +142,7 @@ while [ -n "$1" ]; do
# Are there any files to process?
if [ "$(echo "$ETCDIR"/*.scale "$ETC7DIR"/*.scale)" != "$ETCDIR/*.scale $ETC7DIR/*.scale" ]
then
- for XDIR in "$X11R7DIR" "$X11R6DIR"; do
+ for XDIR in "$X11R7DIR"; do
if [ -z "$XDIR" ] || ! [ -d "$XDIR" ]; then
continue
fi
@@ -183,7 +182,7 @@ while [ -n "$1" ]; do
fi
done
else
- for XDIR in "$X11R7DIR" "$X11R6DIR"; do
+ for XDIR in "$X11R7DIR"; do
if [ -z "$XDIR" ] || ! [ -d "$XDIR" ]; then
continue
fi
Reply to: