X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installxfonts;h=276f903c0240b4b17273f3687b9cd384c1270b69;hb=c4a6279687b7b1a5dd4a9d3d32ddd6cd4375d4cf;hp=2bcbe1fa3491ba6bdd3fe8ff03ebbab2a2b8ec83;hpb=5cb05036a7c2716d3622290567881fd02a1b995d;p=debhelper.git

diff --git a/dh_installxfonts b/dh_installxfonts
index 2bcbe1f..276f903 100755
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -22,16 +22,17 @@ and fonts.scale be rebuilt properly at install time.
 Before calling this program, you should have installed any X fonts provided
 by your package into the appropriate location in the package build
 directory, and if you have fonts.alias or fonts.scale files, you should
-install them into the correct location under etc/X11/fonts in your package
-build directory.
+install them into the correct location under etc/X11/fonts in your
+package build directory.
 
 Your package should depend on xfonts-utils so that the
 update-fonts-* commands are available. (This program adds that dependency to
 ${misc:Depends}.)
 
 This program automatically generates the postinst and postrm commands needed
-to register X fonts.  See L<dh_installdeb(1)> for an explanation of how this
-works.
+to register X fonts. These commands are inserted into the maintainer
+scripts by dh_installdeb. See L<dh_installdeb(1)> for an explanation of how
+this works.
 
 =head1 NOTES
 
@@ -51,7 +52,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	# Find all font directories in the package build directory.
 	my @fontdirs;
 	foreach my $parentdir ("$tmp/usr/X11R6/lib/X11/fonts/", "$tmp/usr/share/fonts/X11/") {
-		opendir DIR, $parentdir || next;
+		opendir(DIR, $parentdir) || next;
 		@fontdirs = grep { -d "$parentdir/$_" && !/^\./ } (readdir DIR);
 		closedir DIR;
 	}
@@ -64,7 +65,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			# This must come before update-fonts-dir.
 			push @cmds, "update-fonts-scale $f"
 				if -f "$tmp/etc/X11/fonts/$f/$package.scale";
-			push @cmds, "update-fonts-dir $f";
+			push @cmds, "update-fonts-dir --x11r7-layout $f";
 			push @cmds, "update-fonts-alias $f"
 				if -f "$tmp/etc/X11/fonts/$f/$package.alias";
 		}