dh_auto_test: New program, automates running make test or make check if the Makefile...

[debhelper.git] / dh_installxfonts

diff --git a/dh_installxfonts b/dh_installxfonts
index 2bcbe1fa3491ba6bdd3fe8ff03ebbab2a2b8ec83..b7921a2b5bd6b558d5d54d07dc56dec0182d5cb6 100755 (executable)
--- 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
 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
 
 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
 
 
 =head1 NOTES
 


@@ -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";
                        # 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";
                }
                        push @cmds, "update-fonts-alias $f"
                                if -f "$tmp/etc/X11/fonts/$f/$package.alias";
                }