From 56a432ea5f488b960248a772ffcabf5bb2cd4ff0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Dec 2009 15:11:44 -0500 Subject: dh_installxfonts: Use new update-fonts-alias --include and --exclude options to better handle removal in the case where xfonts-utils is removed before a font package is purged. (#543512; thanks, Theppitak Karoonboonyanan) --- dh_installxfonts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'dh_installxfonts') diff --git a/dh_installxfonts b/dh_installxfonts index 07d6ff1d..9cde68bb 100755 --- a/dh_installxfonts +++ b/dh_installxfonts @@ -61,19 +61,23 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # Figure out what commands the postinst and postrm will need # to call. my @cmds; + my @cmds_postinst; + my @cmds_postrm; foreach my $f (@fontdirs) { # 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"; + 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"; + } } autoscript($package, "postinst", "postinst-xfonts", - "s:#CMDS#:".join(";", @cmds).":;"); + "s:#CMDS#:".join(";", @cmds).";".join(";", @cmds_postinst).":;"); autoscript($package, "postrm", "postrm-xfonts", - "s:#CMDS#:".join(";", @cmds).":;"); + "s:#CMDS#:".join(";", @cmds).";".join(";", @cmds_postrm).":;"); addsubstvar($package, "misc:Depends", "xfonts-utils"); } -- cgit v1.2.3