r301: * dh_installxfonts: Patch from Anthony Wong to fix directory searching.

     Closes: #48931

diff --git a/debian/changelog b/debian/changelog
index 8b0faa0138297826986035ada98c379a4f01163c..720d6735a03320018f785c224a84dfbdc3367f80 100644 (file)
--- 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 e1a46aab3493ca7c47a0983f327e139eb2b06eb1..1ceb3cbe39ecc4f961b357a67bc6421b3ea9f86b 100755 (executable)
--- 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) {