r421: use strict

[debhelper.git] / dh_installdeb

diff --git a/dh_installdeb b/dh_installdeb
index 63e0f7fc9860c64349483e5adb936aa92d399df6..d0af6b50555866e1c71dab46652c276e1f744e61 100755 (executable)
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -2,66 +2,67 @@
 #
 # Install files from debian/ into the package's DEBIAN directory.
 
+use strict;
 use Debian::Debhelper::Dh_Lib;
 init();
 
-foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
-       $TMP=tmpdir($PACKAGE);
-       $EXT=pkgext($PACKAGE);
+foreach my $package (@{$dh{DOPACKAGES}}) {
+       my $tmp=tmpdir($package);
+       my $ext=pkgext($package);
 
-       if (! -d "$TMP/DEBIAN") {
-               doit("install","-o",0,"-g",0,"-d","$TMP/DEBIAN");
+       if (! -d "$tmp/DEBIAN") {
+               doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
        }
 
        # Install debian install scripts.
        # If any .debhelper files exist, add them into the scripts.
-       foreach $file (qw{postinst preinst prerm postrm}) {
-               $f=pkgfile($PACKAGE,$file);
+       foreach my $file (qw{postinst preinst prerm postrm}) {
+               my $f=pkgfile($package,$file);
                if ($f) {
-                       if (-f "debian/$EXT$file.debhelper") {
+                       if (-f "debian/$ext$file.debhelper") {
                                # Add this into the script, where it has
                                # #DEBHELPER#
                                # TODO: do internally, no perl fork?
-                               complex_doit("perl -pe 's~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg' < $f > $TMP/DEBIAN/$file");
+                               complex_doit("perl -pe 's~#DEBHELPER#~qx{cat debian/$ext$file.debhelper}~eg' < $f > $tmp/DEBIAN/$file");
                        }
                        else {
                                # Just get rid of any #DEBHELPER# in the 
                                # script.
-                               complex_doit("sed s/#DEBHELPER#// < $f > $TMP/DEBIAN/$file");
+                               complex_doit("sed s/#DEBHELPER#// < $f > $tmp/DEBIAN/$file");
                        }
-                       doit("chown","0.0","$TMP/DEBIAN/$file");
-                       doit("chmod",755,"$TMP/DEBIAN/$file");
+                       doit("chown","0.0","$tmp/DEBIAN/$file");
+                       doit("chmod",755,"$tmp/DEBIAN/$file");
                }
                else {
                        # Auto-generate script header and add .debhelper
                        # content to it.
-                       if (-f "debian/$EXT$file.debhelper") {
-                               complex_doit("echo '#!/bin/sh -e' > $TMP/DEBIAN/$file");
-                               complex_doit("cat debian/$EXT$file.debhelper >> $TMP/DEBIAN/$file");
-                               doit("chown","0.0","$TMP/DEBIAN/$file");
-                               doit("chmod",755,"$TMP/DEBIAN/$file");
+                       if (-f "debian/$ext$file.debhelper") {
+                               complex_doit("echo '#!/bin/sh -e' > $tmp/DEBIAN/$file");
+                               complex_doit("cat debian/$ext$file.debhelper >> $tmp/DEBIAN/$file");
+                               doit("chown","0.0","$tmp/DEBIAN/$file");
+                               doit("chmod",755,"$tmp/DEBIAN/$file");
                        }
                }
        }
 
        # Install non-executable files
-       foreach $file (qw{shlibs conffiles}) {
-               $f=pkgfile($PACKAGE,$file);
+       foreach my $file (qw{shlibs conffiles}) {
+               my $f=pkgfile($package,$file);
                if ($f) {
-                       doit("install","-o",0,"-g",0,"-m",644,"-p",$f,"$TMP/DEBIAN/$file");
+                       doit("install","-o",0,"-g",0,"-m",644,"-p",$f,"$tmp/DEBIAN/$file");
                }
        }
 
        # Automatic conffiles registration: If it is in /etc, it is a
        # conffile.
-       if (! Debian::Debhelper::Dh_Lib::compat(2) && -d "$TMP/etc") {
-               complex_doit("find $TMP/etc -type f |sed 's~^$TMP~~' >> $TMP/DEBIAN/conffiles");
+       if (! compat(2) && -d "$tmp/etc") {
+               complex_doit("find $tmp/etc -type f |sed 's~^$tmp~~' >> $tmp/DEBIAN/conffiles");
                # Anything found?
-               if (-z "$TMP/DEBIAN/conffiles") {
-                       doit("rm", "-f", "$TMP/DEBIAN/conffiles");
+               if (-z "$tmp/DEBIAN/conffiles") {
+                       doit("rm", "-f", "$tmp/DEBIAN/conffiles");
                }
                else {
-                       doit("chmod", 644, "$TMP/DEBIAN/conffiles");
+                       doit("chmod", 644, "$tmp/DEBIAN/conffiles");
                }
        }
 }