r420: big monsta changes

[debhelper.git] / dh_installxfonts

diff --git a/dh_installxfonts b/dh_installxfonts
index 1ceb3cbe39ecc4f961b357a67bc6421b3ea9f86b..024307cdbbe8e47ba8cc0c8014d220c0da330130 100755 (executable)
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -2,13 +2,13 @@
 #
 # Integration with the Debian X11 font policy.
 
-BEGIN { push @INC, "debian", "/usr/share/debhelper" }
-use Dh_Lib;
+use strict;
+use Debian::Debhelper::Dh_Lib;
 init();
 
-foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
-       $TMP=tmpdir($PACKAGE);
-       my $XFONTDIR="$TMP/usr/X11R6/lib/X11/fonts/";
+foreach my $package (@{$dh{DOPACKAGES}}) {
+       my $tmp=tmpdir($package);
+       my $XFONTDIR="$tmp/usr/X11R6/lib/X11/fonts/";
 
        # Find all fint directories in the package build directory.
        opendir DIR, $XFONTDIR || next;
@@ -20,16 +20,16 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                my @updatecmds=('/usr/bin/X11/mkfontdir');
                foreach my $f (@fontdirs) {
                        push @updatecmds, '/usr/sbin/update-fonts-alias'
-                               if -f "$TMP/etc/X11/fonts/$f/$PACKAGE.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";
+                               if -f "$tmp/etc/X11/fonts/$f/$package.scale";
                }
 
-               autoscript($PACKAGE, "postinst", "postinst-xfonts",
+               autoscript($package, "postinst", "postinst-xfonts",
                        "s:#FONTDIRS#:".join(' ', @fontdirs).
                        ":;s:#UPDATECMDS#:".join(' ', @updatecmds).":");
-               autoscript($PACKAGE, "postrm", "postrm-xfonts",
+               autoscript($package, "postrm", "postrm-xfonts",
                        "s:#FONTDIRS#:".join(' ', @fontdirs).
                        ":;s:#UPDATECMDS#:".join(' ', @updatecmds).":");
        }