X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installxfonts;h=b7921a2b5bd6b558d5d54d07dc56dec0182d5cb6;hb=e7706c28cecffccb52f2f1e6a30a141f23fbfcf5;hp=655a5f352b6c9a0b3d89f813dd240c25a5101c58;hpb=240c250d5bcc48583d0726b57ca8e38a605c9659;p=debhelper.git

diff --git a/dh_installxfonts b/dh_installxfonts
index 655a5f3..b7921a2 100755
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -22,7 +22,7 @@ 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/X11R7 in your
+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
@@ -30,8 +30,9 @@ 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
 
@@ -62,11 +63,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		my @cmds;
 		foreach my $f (@fontdirs) {
 			# This must come before update-fonts-dir.
-			push @cmds, "update-fonts-scale --x11r7-layout $f"
-				if -f "$tmp/etc/X11/fonts/X11R7/$f/$package.scale";
+			push @cmds, "update-fonts-scale $f"
+				if -f "$tmp/etc/X11/fonts/$f/$package.scale";
 			push @cmds, "update-fonts-dir --x11r7-layout $f";
-			push @cmds, "update-fonts-alias --x11r7-layout $f"
-				if -f "$tmp/etc/X11/fonts/X11R7/$f/$package.alias";
+			push @cmds, "update-fonts-alias $f"
+				if -f "$tmp/etc/X11/fonts/$f/$package.alias";
 		}
 
 		autoscript($package, "postinst", "postinst-xfonts",