X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installxfonts;h=276f903c0240b4b17273f3687b9cd384c1270b69;hb=4ee9ad6991518276b5c5fddb108f363b3d50957f;hp=010d460cda6190269735eafb8198ad9f77b56bf4;hpb=bc4fe9de827469761052c59c75c7ea6b6b473f85;p=debhelper.git

diff --git a/dh_installxfonts b/dh_installxfonts
index 010d460..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 xutils (>= 4.0.3) so that the
+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
 
@@ -47,12 +48,14 @@ init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
-	my $XFONTDIR="$tmp/usr/X11R6/lib/X11/fonts/";
 
 	# Find all font directories in the package build directory.
-	opendir DIR, $XFONTDIR || next;
-	my @fontdirs = grep { -d "$XFONTDIR/$_" && !/^\./ } (readdir DIR);
-	closedir DIR;
+	my @fontdirs;
+	foreach my $parentdir ("$tmp/usr/X11R6/lib/X11/fonts/", "$tmp/usr/share/fonts/X11/") {
+		opendir(DIR, $parentdir) || next;
+		@fontdirs = grep { -d "$parentdir/$_" && !/^\./ } (readdir DIR);
+		closedir DIR;
+	}
 
 	if (@fontdirs) {
 		# Figure out what commands the postinst and postrm will need 
@@ -62,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";
 		}
@@ -72,11 +75,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		autoscript($package, "postrm", "postrm-xfonts",
 			"s:#CMDS#:".join(";", @cmds).":;");
 
-		addsubstvar($package, "misc:Depends", "xutils", ">= 4.0.3");
+		addsubstvar($package, "misc:Depends", "xfonts-utils");
 	}
 	else {
 		# remove
-		addsubstvar($package, "misc:Depends", "xutils", ">= 4.0.3", 1);
+		addsubstvar($package, "misc:Depends", "xfonts-utils", "", 1);
 	}
 }