stop trying to handle substvars idempotently

[debhelper.git] / dh_installxfonts

diff --git a/dh_installxfonts b/dh_installxfonts
index 276f903c0240b4b17273f3687b9cd384c1270b69..25e073bcd94e26044dbcf70732bf40f7659a4117 100755 (executable)
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -51,7 +51,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
        # 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/") {
+       foreach my $parentdir ("$tmp/usr/share/fonts/X11/") {
                opendir(DIR, $parentdir) || next;
                @fontdirs = grep { -d "$parentdir/$_" && !/^\./ } (readdir DIR);
                closedir DIR;
@@ -61,26 +61,27 @@ 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";
+                               addsubstvar($package, "misc:Depends", "xfonts-utils (>= 1:7.5+2)");
+                       }
                }
 
                autoscript($package, "postinst", "postinst-xfonts",
-                       "s:#CMDS#:".join(";", @cmds).":;");
+                       "s:#CMDS#:".join(";", @cmds, @cmds_postinst).":");
                autoscript($package, "postrm", "postrm-xfonts",
-                       "s:#CMDS#:".join(";", @cmds).":;");
+                       "s:#CMDS#:".join(";", @cmds, @cmds_postrm).":");
 
                addsubstvar($package, "misc:Depends", "xfonts-utils");
        }
-       else {
-               # remove
-               addsubstvar($package, "misc:Depends", "xfonts-utils", "", 1);
-       }
 }
 
 =head1 SEE ALSO