diff options
| author | joey <joey> | 1999-11-01 23:16:03 +0000 |
|---|---|---|
| committer | joey <joey> | 1999-11-01 23:16:03 +0000 |
| commit | 067a26d8a40fa40003e0c9b2dfbfa76af71bf59e (patch) | |
| tree | 1e1cd6746b95f610e46cfa21b07fa24b31eb18ac | |
| parent | f352850081b06261306024b92763cdbe24974c53 (diff) | |
r301: * dh_installxfonts: Patch from Anthony Wong to fix directory searching.
Closes: #48931
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | dh_installxfonts | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 8b0faa0..720d673 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (2.0.68) unstable; urgency=low + + * dh_installxfonts: Patch from Anthony Wong to fix directory searching. + Closes: #48931 + + -- Joey Hess <joeyh@master.debian.org> Mon, 1 Nov 1999 14:46:04 -0800 + debhelper (2.0.67) unstable; urgency=low * dh_installdebconf: Modified to use new confmodule debconf library. diff --git a/dh_installxfonts b/dh_installxfonts index e1a46aa..1ceb3cb 100755 --- a/dh_installxfonts +++ b/dh_installxfonts @@ -8,10 +8,11 @@ init(); foreach $PACKAGE (@{$dh{DOPACKAGES}}) { $TMP=tmpdir($PACKAGE); + my $XFONTDIR="$TMP/usr/X11R6/lib/X11/fonts/"; # Find all fint directories in the package build directory. - opendir DIR, "$TMP/usr/X11R6/lib/X11/fonts/" || next; - my @fontdirs = grep { -d $_ && !/^\./ } (readdir DIR); + opendir DIR, $XFONTDIR || next; + my @fontdirs = grep { -d "$XFONTDIR/$_" && !/^\./ } (readdir DIR); closedir DIR; if (@fontdirs) { |