X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installxfonts;h=b7921a2b5bd6b558d5d54d07dc56dec0182d5cb6;hb=fcc792210d4e089a41b1c14ccca9f0a8a7e0f2ec;hp=e1a46aab3493ca7c47a0983f327e139eb2b06eb1;hpb=85ad35770e541b848bf2954424879318da797b84;p=debhelper.git

diff --git a/dh_installxfonts b/dh_installxfonts
index e1a46aa..b7921a2 100755
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -1,35 +1,96 @@
 #!/usr/bin/perl -w
-#
-# Integration with the Debian X11 font policy.
 
-BEGIN { push @INC, "debian", "/usr/share/debhelper" }
-use Dh_Lib;
+=head1 NAME
+
+dh_installxfonts - register X fonts
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+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.
+
+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.
+
+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. 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
+
+See L<update-fonts-alias(8)>, L<update-fonts-scale(8)>, and
+L<update-fonts-dir(8)> for more information about X font installation.
+
+See Debian policy, section 11.8.5. for details about doing fonts the Debian
+way.
+
+=cut
+
 init();
 
-foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
-	$TMP=tmpdir($PACKAGE);
+foreach my $package (@{$dh{DOPACKAGES}}) {
+	my $tmp=tmpdir($package);
 
-	# Find all fint directories in the package build directory.
-	opendir DIR, "$TMP/usr/X11R6/lib/X11/fonts/" || next;
-	my @fontdirs = grep { -d $_ && !/^\./ } (readdir DIR);
-	closedir DIR;
+	# 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;
+		@fontdirs = grep { -d "$parentdir/$_" && !/^\./ } (readdir DIR);
+		closedir DIR;
+	}
 
 	if (@fontdirs) {
-		# Figure out what commands the postinst will need to call.
-		my @updatecmds=('/usr/bin/X11/mkfontdir');
+		# Figure out what commands the postinst and postrm will need 
+		# to call.
+		my @cmds;
 		foreach my $f (@fontdirs) {
-			push @updatecmds, '/usr/sbin/update-fonts-alias'
-				if -f "$TMP/etc/X11/fonts/$f/$PACKAGE.alias";
-			# This must come _before_ mkfontdir, thus the unshift.
-			unshift @updatecmds, '/usr/sbin/update-fonts-scale'
-				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 --x11r7-layout $f";
+			push @cmds, "update-fonts-alias $f"
+				if -f "$tmp/etc/X11/fonts/$f/$package.alias";
 		}
 
-		autoscript($PACKAGE, "postinst", "postinst-xfonts",
-			"s:#FONTDIRS#:".join(' ', @fontdirs).
-			":;s:#UPDATECMDS#:".join(' ', @updatecmds).":");
-		autoscript($PACKAGE, "postrm", "postrm-xfonts",
-			"s:#FONTDIRS#:".join(' ', @fontdirs).
-			":;s:#UPDATECMDS#:".join(' ', @updatecmds).":");
+		autoscript($package, "postinst", "postinst-xfonts",
+			"s:#CMDS#:".join(";", @cmds).":;");
+		autoscript($package, "postrm", "postrm-xfonts",
+			"s:#CMDS#:".join(";", @cmds).":;");
+
+		addsubstvar($package, "misc:Depends", "xfonts-utils");
+	}
+	else {
+		# remove
+		addsubstvar($package, "misc:Depends", "xfonts-utils", "", 1);
 	}
 }
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of debhelper.
+
+=head1 AUTHOR
+
+Joey Hess <joeyh@debian.org>
+
+=cut