diff options
| -rwxr-xr-x | dh_auto_install | 2 | ||||
| -rwxr-xr-x | dh_bugfiles | 9 | ||||
| -rwxr-xr-x | dh_gconf | 5 | ||||
| -rwxr-xr-x | dh_installemacsen | 5 | ||||
| -rwxr-xr-x | dh_installgsettings | 5 | ||||
| -rwxr-xr-x | dh_installinit | 16 | ||||
| -rwxr-xr-x | dh_lintian | 4 | ||||
| -rwxr-xr-x | dh_shlibdeps | 2 |
8 files changed, 26 insertions, 22 deletions
diff --git a/dh_auto_install b/dh_auto_install index a580e0b5..afc9cf1a 100755 --- a/dh_auto_install +++ b/dh_auto_install @@ -83,7 +83,7 @@ $destdir = File::Spec->rel2abs($destdir, cwd()); foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp=tmpdir($package); if (! -e $tmp) { - doit("install","-d",$tmp); + install_dir($tmp); } } diff --git a/dh_bugfiles b/dh_bugfiles index 90498a40..0b5edf0e 100755 --- a/dh_bugfiles +++ b/dh_bugfiles @@ -95,20 +95,21 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # If there is only a bug script to install, install it as # usr/share/bug/$package (unless this path is a directory) if (! -d $dir && scalar(keys(%bugfiles)) == 1 && exists $bugfiles{script}) { - doit("install","-D","-p","-m755",$bugfiles{script},$dir); + install_dir($dir); + install_file($bugfiles{script}, $dir); } elsif (scalar(keys(%bugfiles)) > 0) { if (-f $dir) { # Move usr/share/bug/$package to usr/share/bug/$package/script doit("mv", $dir, "${dir}.tmp"); - doit("install","-d",$dir); + install_dir($dir); doit("mv", "${dir}.tmp", "$dir/script"); } elsif (! -d $dir) { - doit("install","-d",$dir); + install_dir($dir); } while (my ($type, $srcfile) = each(%bugfiles)) { - doit("install","-p","-m644",$srcfile, "$dir/$type"); + install_file($srcfile, "$dir/$type"); } } @@ -65,8 +65,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $mandatory = pkgfile($package, "gconf-mandatory"); if ($mandatory ne '') { - doit("mkdir","-p","$tmp/usr/share/gconf/mandatory"); - doit("install","-p","-m644",$mandatory,"$tmp/usr/share/gconf/mandatory/${priority}_$package"); + install_dir("$tmp/usr/share/gconf/mandatory"); + install_file($mandatory, + "$tmp/usr/share/gconf/mandatory/${priority}_$package"); } my $defaults = pkgfile($package,"gconf-defaults"); if ($defaults ne '') { diff --git a/dh_installemacsen b/dh_installemacsen index 1a1f008f..a4884a5f 100755 --- a/dh_installemacsen +++ b/dh_installemacsen @@ -100,9 +100,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if ($emacsen_compat ne '') { if (! -d "$tmp/usr/lib/emacsen-common/packages/compat") { - doit("install","-d","$tmp/usr/lib/emacsen-common/packages/compat"); + install_dir("$tmp/usr/lib/emacsen-common/packages/compat"); } - doit("install","-m0644",$emacsen_compat,"$tmp/usr/lib/emacsen-common/packages/compat/$package"); + install_file($emacsen_compat, + "$tmp/usr/lib/emacsen-common/packages/compat/$package"); } if ($emacsen_install ne '') { diff --git a/dh_installgsettings b/dh_installgsettings index 8552e633..66de51af 100755 --- a/dh_installgsettings +++ b/dh_installgsettings @@ -68,8 +68,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $override = pkgfile($package,"gsettings-override"); if ($override ne '') { - doit("mkdir","-p",$gsettings_schemas_dir); - doit("install","-p","-m644",$override,"$gsettings_schemas_dir/${priority}_$package.gschema.override"); + install_dir($gsettings_schemas_dir); + install_file($override, + "$gsettings_schemas_dir/${priority}_$package.gschema.override"); } if (-d "$gsettings_schemas_dir") { diff --git a/dh_installinit b/dh_installinit index d5f413a1..c4c8a921 100755 --- a/dh_installinit +++ b/dh_installinit @@ -197,30 +197,30 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $service=pkgfile($package,"service"); if ($service ne '' && ! $dh{ONLYSCRIPTS}) { my $path="$tmp/lib/systemd/system"; - if (! -d "$path") { - doit("install","-d","$path"); + if (! -d $path) { + install_dir($path); } - doit("install","-p","-m644",$service,"$path/$script.service"); + install_file($service, "$path/$script.service"); } my $tmpfile=pkgfile($package,"tmpfile"); if ($tmpfile ne '' && ! $dh{ONLYSCRIPTS}) { my $path="$tmp/usr/lib/tmpfiles.d"; - if (! -d "$path") { - doit("install","-d","$path"); + if (! -d $path) { + install_dir($path); } - doit("install","-p","-m644",$tmpfile,"$path/$script.conf"); + install_file($tmpfile, "$path/$script.conf"); } my $job=pkgfile($package,"upstart"); if ($job ne '' && ! $dh{ONLYSCRIPTS}) { if (! -d "$tmp/etc/init") { - doit("install","-d","$tmp/etc/init"); + install_dir("$tmp/etc/init"); } - doit("install","-p","-m644",$job,"$tmp/etc/init/$jobfile.conf"); + install_file($job, "$tmp/etc/init/$jobfile.conf"); } my $default=pkgfile($package,'default'); @@ -49,8 +49,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $overrides=pkgfile($package,"lintian-overrides"); if ($overrides ne '') { - if (! -d "$or_dir") { - doit("install","-d","$or_dir"); + if (! -d $or_dir) { + install_dir($or_dir); } install_dh_config_file($overrides, "$or_dir/$package"); } diff --git a/dh_shlibdeps b/dh_shlibdeps index 19b67280..97109e3a 100755 --- a/dh_shlibdeps +++ b/dh_shlibdeps @@ -105,7 +105,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # dpkg-shlibdeps expects this directory to exist if (! -d "$tmp/DEBIAN") { - doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN"); + install_dir("$tmp/DEBIAN"); } my @filelist; |