[Reproducible-commits] [debhelper] 34/61: Migrate some calls to use the new install_X subs
Mattia Rizzolo
mattia at mapreri.org
Sat Apr 4 18:37:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
mapreri-guest pushed a commit to branch pu/reproducible_builds
in repository debhelper.
commit 0bf56fc00831503055e561f317bee183242f23fa
Author: Martin Koeppe <mkoeppe at gmx.de>
Date: Thu Jan 8 17:41:10 2015 +0100
Migrate some calls to use the new install_X subs
Signed-off-by: Niels Thykier <niels at thykier.net>
---
Debian/Debhelper/Dh_Lib.pm | 2 +-
dh_gconf | 2 +-
dh_gencontrol | 2 +-
dh_install | 4 ++--
dh_installcatalogs | 8 ++++----
dh_installchangelogs | 15 ++++++---------
dh_installcron | 10 +++++-----
dh_installdeb | 7 +++----
dh_installdebconf | 7 +++----
dh_installdirs | 4 ++--
dh_installdocs | 25 ++++++++++++-------------
dh_installemacsen | 14 +++++++-------
dh_installexamples | 2 +-
dh_installifupdown | 6 +++---
dh_installinfo | 2 +-
dh_installinit | 8 ++++----
dh_installlogcheck | 4 ++--
dh_installlogrotate | 4 ++--
dh_installman | 4 ++--
dh_installmanpages | 10 +++++-----
dh_installmenu | 10 +++++-----
dh_installmime | 9 +++++----
dh_installmodules | 6 +++---
dh_installpam | 6 +++---
dh_installppp | 4 ++--
dh_installudev | 4 ++--
dh_makeshlibs | 2 +-
dh_md5sums | 2 +-
dh_movefiles | 2 +-
dh_strip | 2 +-
30 files changed, 91 insertions(+), 96 deletions(-)
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 9243020..67ce5c2 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -1005,7 +1005,7 @@ sub make_symlink{
# Make sure the directory the link will be in exists.
my $basedir=dirname("$tmp/$dest");
if (! -e $basedir) {
- doit("install","-d",$basedir);
+ install_dir($basedir);
}
# Policy says that if the link is all within one toplevel
diff --git a/dh_gconf b/dh_gconf
index c200bea..7b099da 100755
--- a/dh_gconf
+++ b/dh_gconf
@@ -71,7 +71,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $defaults = pkgfile($package,"gconf-defaults");
if ($defaults ne '') {
doit("mkdir","-p","$tmp/usr/share/gconf/defaults");
- doit("install","-p","-m644",$defaults,"$tmp/usr/share/gconf/defaults/${priority}_$package");
+ install_file($defaults, "$tmp/usr/share/gconf/defaults/${priority}_$package");
}
my $old_schemas_dir = "$tmp/etc/gconf/schemas";
diff --git a/dh_gencontrol b/dh_gencontrol
index e80197a..64d0261 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -56,7 +56,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
if ( ! -d "$tmp/DEBIAN" ) {
- doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
+ install_dir("$tmp/DEBIAN");
}
# avoid gratuitous warning
diff --git a/dh_install b/dh_install
index ebc4207..5c56f13 100755
--- a/dh_install
+++ b/dh_install
@@ -192,10 +192,10 @@ foreach my $package (getpackages()) {
$dest=dirname("/".$dest);
$tmpdest=1;
}
-
+
# Make sure the destination directory exists.
if (! -e "$tmp/$dest") {
- doit("install","-d","$tmp/$dest");
+ install_dir("$tmp/$dest");
}
if (-d $src && $exclude) {
diff --git a/dh_installcatalogs b/dh_installcatalogs
index eee7368..de6a138 100755
--- a/dh_installcatalogs
+++ b/dh_installcatalogs
@@ -83,11 +83,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
$fulldest =~ s|//|/|g; # beautification
if (! -d dirname($fulldest)) {
- doit("install","-d","-m755",$tmpdir."/".dirname($dest));
+ install_dir($tmpdir."/".dirname($dest));
}
- doit("install","-p","-m644",$source,$fulldest);
-
+ install_file($source,$fulldest);
+
push(@sgmlinstalled,$dest);
}
}
@@ -95,7 +95,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
addsubstvar($package, "misc:Depends", "sgml-base", ">= $sgmlbasever");
if (! -d "$tmpdir/etc/sgml") {
- doit("install","-d","-m755","$tmpdir/etc/sgml");
+ install_dir("$tmpdir/etc/sgml");
}
my $centralcat = "/etc/sgml/$package.cat";
diff --git a/dh_installchangelogs b/dh_installchangelogs
index 914a280..0ee2a90 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -197,32 +197,29 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
if (! -d "$tmp/usr/share/doc/$package") {
- doit("install","-d","$tmp/usr/share/doc/$package");
+ install_dir("$tmp/usr/share/doc/$package");
}
if (! $dh{NO_ACT}) {
if (! install_binNMU_changelog($package, $changelog, $changelog_name)) {
- doit("install","-o",0,"-g",0,"-p","-m644",$changelog,
- "$tmp/usr/share/doc/$package/$changelog_name");
+ install_file($changelog,
+ "$tmp/usr/share/doc/$package/$changelog_name");
}
}
if (-e $news) {
- doit("install","-o",0,"-g",0,"-p","-m644",$news,
- "$tmp/usr/share/doc/$package/$news_name");
+ install_file($news, "$tmp/usr/share/doc/$package/$news_name");
}
if (defined $upstream) {
my $link_to;
my $base="$tmp/usr/share/doc/$package";
if (defined $upstream_text) {
- doit("install","-o",0,"-g",0,"-p","-m644",
- $upstream_text,"$base/changelog");
+ install_file($upstream_text, "$base/changelog");
$link_to='changelog';
}
if (defined $upstream_html) {
- doit("install","-o",0,"-g",0,"-p","-m644",
- $upstream_html,"$base/changelog.html");
+ install_file($upstream_html,"$base/changelog.html");
$link_to='changelog.html';
if (! defined $upstream_text) {
complex_doit("echo 'See changelog.html.gz' > $base/changelog");
diff --git a/dh_installcron b/dh_installcron
index 027905f..7583734 100755
--- a/dh_installcron
+++ b/dh_installcron
@@ -61,18 +61,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $cron=pkgfile($package,"cron.$type");
if ($cron) {
if (! -d "$tmp/etc/cron.$type") {
- doit("install","-o",0,"-g",0,"-d","$tmp/etc/cron.$type");
+ install_dir("$tmp/etc/cron.$type");
}
- doit("install",$cron,"$tmp/etc/cron.$type/".pkgfilename($package));
+ install_prog($cron,"$tmp/etc/cron.$type/".pkgfilename($package));
}
}
# Seperate because this needs to be mode 644.
my $cron=pkgfile($package,"cron.d");
if ($cron) {
if (! -d "$tmp/etc/cron.d") {
- doit("install","-o",0,"-g",0,"-d","$tmp/etc/cron.d");
- }
- doit("install","-m",644,$cron,"$tmp/etc/cron.d/".pkgfilename($package));
+ install_dir("$tmp/etc/cron.d");
+ }
+ install_file($cron,"$tmp/etc/cron.d/".pkgfilename($package));
}
}
diff --git a/dh_installdeb b/dh_installdeb
index 2e4746d..02961ad 100755
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -77,7 +77,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
if (! -d "$tmp/DEBIAN") {
- doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
+ install_dir("$tmp/DEBIAN");
}
if (is_udeb($package)) {
@@ -86,8 +86,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
foreach my $script (qw{postinst menutest isinstallable}) {
my $f=pkgfile($package,$script);
if ($f) {
- doit("install", "-o", 0, "-g", 0, "-m", 755,
- $f, "$tmp/DEBIAN/$script");
+ install_prog($f, "$tmp/DEBIAN/$script");
}
}
@@ -121,7 +120,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
foreach my $file (qw{shlibs conffiles triggers}) {
my $f=pkgfile($package,$file);
if ($f) {
- doit("install","-o",0,"-g",0,"-m",644,"-p",$f,"$tmp/DEBIAN/$file");
+ install_file($f, "$tmp/DEBIAN/$file");
}
}
diff --git a/dh_installdebconf b/dh_installdebconf
index 4307aa7..4a8ddf4 100755
--- a/dh_installdebconf
+++ b/dh_installdebconf
@@ -89,7 +89,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $templates=pkgfile($package,"templates");
if (! -d "$tmp/DEBIAN") {
- doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
+ install_dir("$tmp/DEBIAN");
}
if (! is_udeb($package)) {
@@ -103,13 +103,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
umask(0022); # since I do a redirect below
-
+
if (-d "debian/po") {
complex_doit("po2debconf @extraparams $templates > $tmp/DEBIAN/templates");
}
else {
- doit("install", "-o", 0, "-g", 0, "-m", 644, "-p",
- $templates, "$tmp/DEBIAN/templates");
+ install_file($templates,"$tmp/DEBIAN/templates");
}
}
diff --git a/dh_installdirs b/dh_installdirs
index 2750de8..d064689 100755
--- a/dh_installdirs
+++ b/dh_installdirs
@@ -55,7 +55,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $file=pkgfile($package,"dirs");
if (! -e $tmp) {
- doit("install","-d",$tmp);
+ install_dir($tmp);
}
my @dirs;
@@ -81,7 +81,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
} @dirs;
# Create dirs.
- doit("install","-d", at dirs);
+ install_dir(@dirs);
}
}
diff --git a/dh_installdocs b/dh_installdocs
index 50ac48c..93ceaf1 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -149,7 +149,7 @@ sub ensure_docdir {
# If this is a symlink, leave it alone.
if (! -d $target && ! -l $target) {
- doit("install","-g",0,"-o",0,"-d",$target);
+ install_dir($target);
}
$docdir_created{$package}=1;
}
@@ -179,7 +179,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
# Make sure that the parent directory exists.
if (! -d "$tmp/usr/share/doc" && ! -l "$tmp/usr/share/doc") {
- doit("install","-g",0,"-o",0,"-d","$tmp/usr/share/doc");
+ install_dir("$tmp/usr/share/doc");
}
# Create symlink to another documentation directory if
# necessary.
@@ -247,19 +247,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
if (! $link_doc && $readme_debian && ! excludefile($readme_debian)) {
ensure_docdir($package);
- doit("install","-g",0,"-o",0,"-m","644","-p","$readme_debian",
- "$tmp/usr/share/doc/$package/README.Debian");
+ install_file($readme_debian,
+ "$tmp/usr/share/doc/$package/README.Debian");
}
my $todo=pkgfile($package,'TODO');
if (! $link_doc && $todo && ! excludefile($todo)) {
ensure_docdir($package);
if (isnative($package)) {
- doit("install","-g",0,"-o",0,"-m","644","-p",$todo,
- "$tmp/usr/share/doc/$package/TODO");
+ install_file($todo, "$tmp/usr/share/doc/$package/TODO");
}
else {
- doit("install","-g",0,"-o",0,"-m","644","-p",$todo,
+ install_file($todo,
"$tmp/usr/share/doc/$package/TODO.Debian");
}
}
@@ -277,7 +276,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
if ($copyright && ! excludefile($copyright)) {
ensure_docdir($package);
- doit("install","-g",0,"-o",0,"-m","644","-p",$copyright,
+ install_file($copyright,
"$tmp/usr/share/doc/$package/copyright");
}
}
@@ -316,7 +315,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (%doc_ids) {
if (! -d "$tmp/usr/share/doc-base/") {
- doit("install","-g",0,"-o",0,"-d","$tmp/usr/share/doc-base/");
+ install_dirdd("$tmp/usr/share/doc-base/");
}
}
# check for duplicate document ids
@@ -336,12 +335,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $fn_no_docbase = $fn;
$fn_no_docbase =~ s/\.doc-base(?:\.(.*))?/
if (defined $1 and length $1) {"-$1"} else {''}/xe;
- doit("install","-g",0,"-o",0,"-m644","-p","debian/$fn",
- "$tmp/usr/share/doc-base/$fn_no_docbase");
+ install_file("debian/$fn",
+ "$tmp/usr/share/doc-base/$fn_no_docbase");
}
else {
- doit("install","-g",0,"-o",0,"-m644","-p","debian/$fn",
- "$tmp/usr/share/doc-base/$doc_ids{$fn}");
+ install_file("debian/$fn",
+ "$tmp/usr/share/doc-base/$doc_ids{$fn}");
}
}
}
diff --git a/dh_installemacsen b/dh_installemacsen
index 9ab0b94..1a1f008 100755
--- a/dh_installemacsen
+++ b/dh_installemacsen
@@ -107,23 +107,23 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if ($emacsen_install ne '') {
if (! -d "$tmp/usr/lib/emacsen-common/packages/install") {
- doit("install","-d","$tmp/usr/lib/emacsen-common/packages/install");
+ install_dir("$tmp/usr/lib/emacsen-common/packages/install");
}
- doit("install","-m0755",$emacsen_install,"$tmp/usr/lib/emacsen-common/packages/install/$package");
+ install_prog($emacsen_install,"$tmp/usr/lib/emacsen-common/packages/install/$package");
}
if ($emacsen_remove ne '') {
if (! -d "$tmp/usr/lib/emacsen-common/packages/remove") {
- doit("install","-d","$tmp/usr/lib/emacsen-common/packages/remove");
+ install_dir("$tmp/usr/lib/emacsen-common/packages/remove");
}
- doit("install","-m0755","$emacsen_remove","$tmp/usr/lib/emacsen-common/packages/remove/$package");
+ install_prog("$emacsen_remove","$tmp/usr/lib/emacsen-common/packages/remove/$package");
}
-
+
if ($emacsen_startup ne '') {
if (! -d "$tmp/etc/$dh{FLAVOR}/site-start.d/") {
- doit("install","-d","$tmp/etc/$dh{FLAVOR}/site-start.d/");
+ install_dir("$tmp/etc/$dh{FLAVOR}/site-start.d/");
}
- doit("install","-m0644",$emacsen_startup,"$tmp/etc/$dh{FLAVOR}/site-start.d/$dh{PRIORITY}$package.el");
+ install_file($emacsen_startup,"$tmp/etc/$dh{FLAVOR}/site-start.d/$dh{PRIORITY}$package.el");
}
if ($emacsen_install ne '' || $emacsen_remove ne '') {
diff --git a/dh_installexamples b/dh_installexamples
index e7a37e4..426e800 100755
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -80,7 +80,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (@examples) {
if (! -d "$tmp/usr/share/doc/$package/examples") {
- doit("install","-d","$tmp/usr/share/doc/$package/examples");
+ install_dir("$tmp/usr/share/doc/$package/examples");
}
my $exclude = '';
diff --git a/dh_installifupdown b/dh_installifupdown
index bcf7bd5..48e1c1a 100755
--- a/dh_installifupdown
+++ b/dh_installifupdown
@@ -56,14 +56,14 @@ init();
foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
-
+
foreach my $script (qw(pre-up up down post-down)) {
my $file=pkgfile($package, "if-$script");
if ($file ne '') {
if (! -d "$tmp/etc/network/if-$script.d") {
- doit("install","-d","$tmp/etc/network/if-$script.d");
+ install_dir("$tmp/etc/network/if-$script.d");
}
- doit("install","-p","-m755",$file,"$tmp/etc/network/if-$script.d/".pkgfilename($package));
+ install_prog($file,"$tmp/etc/network/if-$script.d/".pkgfilename($package));
}
}
}
diff --git a/dh_installinfo b/dh_installinfo
index 5be93ed..5ecd428 100755
--- a/dh_installinfo
+++ b/dh_installinfo
@@ -66,7 +66,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (@info) {
if ( ! -d "$tmp/usr/share/info") {
- doit("install","-d","$tmp/usr/share/info");
+ install_dir("$tmp/usr/share/info");
}
doit("cp", '--reflink=auto', @info, "$tmp/usr/share/info");
doit("chmod","-R", "go=rX","$tmp/usr/share/info/");
diff --git a/dh_installinit b/dh_installinit
index f890016..d5f413a 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -226,9 +226,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $default=pkgfile($package,'default');
if ($default ne '' && ! $dh{ONLYSCRIPTS}) {
if (! -d "$tmp/etc/default") {
- doit("install","-d","$tmp/etc/default");
+ install_dir("$tmp/etc/default");
}
- doit("install","-p","-m644",$default,"$tmp/etc/default/$script");
+ install_file($default, "$tmp/etc/default/$script");
}
my $init=pkgfile($package,$scriptsrc) || pkgfile($package,"init") ||
@@ -236,10 +236,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if ($init ne '' && ! $dh{ONLYSCRIPTS}) {
if (! -d "$tmp/etc/init.d") {
- doit("install","-d","$tmp/etc/init.d");
+ install_dir("$tmp/etc/init.d");
}
- doit("install","-p","-m755",$init,"$tmp/etc/init.d/$script");
+ install_prog($init,"$tmp/etc/init.d/$script");
}
if ($dh{INIT_SCRIPT} && $job ne '' && $init ne '') {
diff --git a/dh_installlogcheck b/dh_installlogcheck
index a73a2e5..3c77bb7 100755
--- a/dh_installlogcheck
+++ b/dh_installlogcheck
@@ -68,11 +68,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $logcheck=pkgfile($package,"logcheck.$typenod");
if ($logcheck) {
if (! -d "$tmp/etc/logcheck/$type") {
- doit("install","-o",0,"-g",0,"-d","$tmp/etc/logcheck/$type");
+ install_dir("$tmp/etc/logcheck/$type");
}
my $packagenodot=pkgfilename($package); # run-parts..
$packagenodot=~s/\./_/g;
- doit("install","-m","0644",$logcheck,"$tmp/etc/logcheck/$type/$packagenodot");
+ install_file($logcheck, "$tmp/etc/logcheck/$type/$packagenodot");
}
}
}
diff --git a/dh_installlogrotate b/dh_installlogrotate
index 99ac2f7..e6d274b 100755
--- a/dh_installlogrotate
+++ b/dh_installlogrotate
@@ -43,9 +43,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if ($file) {
if (! -d "$tmp/etc/logrotate.d") {
- doit("install","-o",0,"-g",0,"-d","$tmp/etc/logrotate.d");
+ install_dir("$tmp/etc/logrotate.d");
}
- doit("install","-m",644,$file,"$tmp/etc/logrotate.d/".pkgfilename($package));
+ install_file($file,"$tmp/etc/logrotate.d/".pkgfilename($package));
}
}
diff --git a/dh_installman b/dh_installman
index 22df803..a467881 100755
--- a/dh_installman
+++ b/dh_installman
@@ -177,13 +177,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
next if compat(5) && -e $instpage;
if (! -d $destdir) {
- doit "install","-d",$destdir;
+ install_dir($destdir);
}
if ($gz) {
complex_doit "zcat \Q$page\E > \Q$instpage\E";
}
else {
- doit "install","-p","-m644",$page,$instpage;
+ install_file($page, $instpage);
}
}
diff --git a/dh_installmanpages b/dh_installmanpages
index 9ab4721..a9f41e5 100755
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -168,18 +168,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
$destdir="$tmp/usr/$extdir/man/$langcode/man$section/";
$instname=~s/\.$langcode\./\./;
}
-
+
$destdir=~tr:/:/:s; # just for looks
-
+
if (! -e "$destdir/$basename" && !-l "$destdir/$basename") {
if (! -d $destdir) {
- doit "install","-d",$destdir;
+ install_dir($destdir);
}
- doit "install","-p","-m644",$page,$destdir.$instname;
+ install_file($page,$destdir.$instname);
}
}
}
-
+
# Now the .so conversion.
@sofiles=@sodests=();
foreach my $dir (qw{usr/share/man}) {
diff --git a/dh_installmenu b/dh_installmenu
index a8ccd78..a735a64 100755
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -61,10 +61,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if ($menu ne '') {
if (! -d "$tmp/usr/share/menu") {
- doit("install","-d","$tmp/usr/share/menu");
+ install_dir("$tmp/usr/share/menu");
}
- doit("install","-p","-m644",$menu,"$tmp/usr/share/menu/$package");
-
+ install_file($menu,"$tmp/usr/share/menu/$package");
+
# Add the scripts if a menu-method file doesn't exist.
# The scripts for menu-method handle everything these do, too.
if ($menu_method eq "" && ! $dh{NOSCRIPTS}) {
@@ -75,9 +75,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if ($menu_method ne '') {
if (!-d "$tmp/etc/menu-methods") {
- doit("install","-d","$tmp/etc/menu-methods");
+ install_dir("$tmp/etc/menu-methods");
}
- doit("install","-p","-m644",$menu_method,"$tmp/etc/menu-methods/$package");
+ install_file($menu_method,"$tmp/etc/menu-methods/$package");
if (! $dh{NOSCRIPTS}) {
autoscript($package,"postinst","postinst-menu-method","s/#PACKAGE#/$package/");
diff --git a/dh_installmime b/dh_installmime
index 312dce7..32d1d6a 100755
--- a/dh_installmime
+++ b/dh_installmime
@@ -46,17 +46,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $mime=pkgfile($package,"mime");
if ($mime ne '') {
if (! -d "$tmp/usr/lib/mime/packages") {
- doit("install","-d","$tmp/usr/lib/mime/packages");
+ install_dir("$tmp/usr/lib/mime/packages");
}
- doit("install","-p","-m644",$mime,"$tmp/usr/lib/mime/packages/$package");
+ install_file($mime, "$tmp/usr/lib/mime/packages/$package");
}
my $sharedmimeinfo=pkgfile($package,"sharedmimeinfo");
if ($sharedmimeinfo ne '') {
if (! -d "$tmp/usr/share/mime/packages") {
- doit("install", "-d", "$tmp/usr/share/mime/packages");
+ install_dir("$tmp/usr/share/mime/packages");
}
- doit("install", "-p", "-m644", $sharedmimeinfo, "$tmp/usr/share/mime/packages/$package.xml");
+ install_file($sharedmimeinfo,
+ "$tmp/usr/share/mime/packages/$package.xml");
}
}
diff --git a/dh_installmodules b/dh_installmodules
index ce94cde..bdc8a24 100755
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -90,16 +90,16 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $modprobe_file=pkgfile($package,"modprobe");
if (! -e $tmp) {
- doit("install","-d",$tmp);
+ install_dir($tmp);
}
if ($modprobe_file) {
if (! -e "$tmp/etc/modprobe.d") {
- doit("install","-d","$tmp/etc/modprobe.d");
+ install_dir("$tmp/etc/modprobe.d");
}
my $old="/etc/modprobe.d/".pkgfilename($package);
my $new=$old.".conf";
- doit("install","-m","0644",$modprobe_file,"$tmp/$new");
+ install_file($modprobe_file, "$tmp/$new");
autoscript($package,"preinst","preinst-moveconffile","s!#OLD#!$old!g;s!#PACKAGE#!$package!g");
autoscript($package,"postinst","postinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$new!g");
}
diff --git a/dh_installpam b/dh_installpam
index e9530c5..47d558f 100755
--- a/dh_installpam
+++ b/dh_installpam
@@ -49,12 +49,12 @@ init();
foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
my $pam=pkgfile($package,"pam");
-
+
if ($pam ne '') {
if (! -d "$tmp/etc/pam.d") {
- doit("install","-d","$tmp/etc/pam.d");
+ install_dir("$tmp/etc/pam.d");
}
- doit("install","-p","-m644",$pam,"$tmp/etc/pam.d/".pkgfilename($package));
+ install_file($pam,"$tmp/etc/pam.d/".pkgfilename($package));
}
}
diff --git a/dh_installppp b/dh_installppp
index 44ad892..82735c4 100755
--- a/dh_installppp
+++ b/dh_installppp
@@ -57,9 +57,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $file=pkgfile($package, "ppp.ip-$script");
if ($file ne '') {
if (! -d "$tmp/etc/ppp/ip-$script.d") {
- doit("install","-d","$tmp/etc/ppp/ip-$script.d");
+ install_dir("$tmp/etc/ppp/ip-$script.d");
}
- doit("install","-p","-m755",$file,"$tmp/etc/ppp/ip-$script.d/".pkgfilename($package));
+ install_prog($file,"$tmp/etc/ppp/ip-$script.d/".pkgfilename($package));
}
}
}
diff --git a/dh_installudev b/dh_installudev
index 94bfade..0939955 100755
--- a/dh_installudev
+++ b/dh_installudev
@@ -98,10 +98,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if ($rules_file) {
if (! -e "$tmp/lib/udev/rules.d") {
- doit("install","-d","$tmp/lib/udev/rules.d");
+ install_dir("$tmp/lib/udev/rules.d");
}
my $rule="/lib/udev/rules.d/$dh{PRIORITY}$filename";
- doit("install","-m","0644",$rules_file,$tmp.$rule);
+ install_file($rules_file, "${tmp}${rule}");
if (! $dh{NOSCRIPTS}) {
# Remove old rule from /etc, unless it's modified,
# in which case we rename it to match the new
diff --git a/dh_makeshlibs b/dh_makeshlibs
index ccb73b6..c6746e3 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -177,7 +177,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
if (! -d "$tmp/DEBIAN") {
- doit("install","-d","$tmp/DEBIAN");
+ install_dir("$tmp/DEBIAN");
}
my $deps=$package;
if ($dh{V_FLAG_SET}) {
diff --git a/dh_md5sums b/dh_md5sums
index c2e34a1..f171c16 100755
--- a/dh_md5sums
+++ b/dh_md5sums
@@ -54,7 +54,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
if (! -d "$tmp/DEBIAN") {
- doit("install","-d","$tmp/DEBIAN");
+ install_dir("$tmp/DEBIAN");
}
# Check if we should exclude conffiles.
diff --git a/dh_movefiles b/dh_movefiles
index 1b0f7c6..1803f45 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -128,7 +128,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if (@tomove) {
if (! -d $tmp) {
- doit("install","-d",$tmp);
+ install_dir($tmp);
}
doit("rm","-f","debian/movelist");
diff --git a/dh_strip b/dh_strip
index 01bea81..ade1e11 100755
--- a/dh_strip
+++ b/dh_strip
@@ -172,7 +172,7 @@ sub make_debug {
}
my $debug_dir=dirname($debug_path);
if (! -d $debug_dir) {
- doit("install", "-d", $debug_dir);
+ install_dir($debug_dir);
}
if (compat(8)) {
doit($objcopy, "--only-keep-debug", $file, $debug_path);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debhelper.git
More information about the Reproducible-commits
mailing list