X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installxfonts;h=d247bfadb631179f0cfe7267b3d3bd19f70c4e4f;hb=18a0da8092ea9f3dc48bca92b36f592af25a608d;hp=9cde68bb2f1f8e19066fedebe8e1c2606969167c;hpb=56a432ea5f488b960248a772ffcabf5bb2cd4ff0;p=debhelper.git

diff --git a/dh_installxfonts b/dh_installxfonts
index 9cde68b..d247bfa 100755
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -15,23 +15,23 @@ B<dh_installxfonts> [S<I<debhelper options>>]
 
 =head1 DESCRIPTION
 
-dh_installxfonts is a debhelper program that is responsible for
-registering X fonts, so their corresponding fonts.dir, fonts.alias,
-and fonts.scale be rebuilt properly at install time.
+B<dh_installxfonts> is a debhelper program that is responsible for
+registering X fonts, so their corresponding F<fonts.dir>, F<fonts.alias>,
+and F<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
+directory, and if you have F<fonts.alias> or F<fonts.scale> files, you should
+install them into the correct location under F<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}.)
+Your package should depend on B<xfonts-utils> so that the
+B<update-fonts->I<*> commands are available. (This program adds that dependency to
+B<${misc:Depends}>.)
 
-This program automatically generates the postinst and postrm commands needed
+This program automatically generates the F<postinst> and F<postrm> commands needed
 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
+scripts by B<dh_installdeb>. See L<dh_installdeb(1)> for an explanation of how
 this works.
 
 =head1 NOTES
@@ -71,20 +71,17 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			if (-f "$tmp/etc/X11/fonts/$f/$package.alias") {
 				push @cmds_postinst, "update-fonts-alias --include /etc/X11/fonts/$f/$package.alias $f";
 				push @cmds_postrm, "update-fonts-alias --exclude /etc/X11/fonts/$f/$package.alias $f";
+				addsubstvar($package, "misc:Depends", "xfonts-utils (>= 1:7.5+2)");
 			}
 		}
 
 		autoscript($package, "postinst", "postinst-xfonts",
-			"s:#CMDS#:".join(";", @cmds).";".join(";", @cmds_postinst).":;");
+			"s:#CMDS#:".join(";", @cmds, @cmds_postinst).":");
 		autoscript($package, "postrm", "postrm-xfonts",
-			"s:#CMDS#:".join(";", @cmds).";".join(";", @cmds_postrm).":;");
+			"s:#CMDS#:".join(";", @cmds, @cmds_postrm).":");
 
 		addsubstvar($package, "misc:Depends", "xfonts-utils");
 	}
-	else {
-		# remove
-		addsubstvar($package, "misc:Depends", "xfonts-utils", "", 1);
-	}
 }
 
 =head1 SEE ALSO