From 96ae867551d5670da44b1b8ba1611fc4853c28f5 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Thu, 1 Jan 2015 21:13:49 +0100 Subject: Add editor hints to the end of all perl modules and scripts Signed-off-by: Niels Thykier --- dh_installcatalogs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'dh_installcatalogs') diff --git a/dh_installcatalogs b/dh_installcatalogs index f65ab7cb..eee73687 100755 --- a/dh_installcatalogs +++ b/dh_installcatalogs @@ -130,3 +130,9 @@ F Adam Di Carlo =cut + +# Local Variables: +# indent-tabs-mode: t +# tab-width: 4 +# cperl-indent-level: 4 +# End: -- cgit v1.2.3 From 0bf56fc00831503055e561f317bee183242f23fa Mon Sep 17 00:00:00 2001 From: Martin Koeppe Date: Thu, 8 Jan 2015 17:41:10 +0100 Subject: Migrate some calls to use the new install_X subs Signed-off-by: Niels Thykier --- 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(-) (limited to 'dh_installcatalogs') diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 92430207..67ce5c2b 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 c200bea2..7b099da3 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 e80197aa..64d02617 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 ebc42070..5c56f131 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 eee73687..de6a1387 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 914a2804..0ee2a908 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 027905ff..75837349 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 2e4746d0..02961ad0 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 4307aa74..4a8ddf4a 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 2750de84..d0646899 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",@dirs); + install_dir(@dirs); } } diff --git a/dh_installdocs b/dh_installdocs index 50ac48ce..93ceaf11 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 9ab0b944..1a1f008f 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 e7a37e4c..426e8009 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 bcf7bd55..48e1c1af 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 5be93ed4..5ecd428c 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 f8900165..d5f413a1 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 a73a2e57..3c77bb75 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 99ac2f7e..e6d274bb 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 22df8030..a467881a 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 9ab47210..a9f41e53 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 a8ccd78c..a735a64c 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 312dce78..32d1d6a3 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 ce94cdea..bdc8a24c 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 e9530c56..47d558fb 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 44ad892b..82735c46 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 94bfade0..09399558 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 ccb73b63..c6746e30 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 c2e34a19..f171c160 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 1b0f7c6f..1803f455 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 01bea81b..ade1e112 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); -- cgit v1.2.3 From 7ecccd6f94c7ce6a76baa8dcd4d74d6a2aac0fe9 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Wed, 1 Jul 2015 18:27:45 +0200 Subject: Migrate to use warnings and use parent Signed-off-by: Niels Thykier --- Debian/Debhelper/Buildsystem/ant.pm | 3 ++- Debian/Debhelper/Buildsystem/autoconf.pm | 3 ++- Debian/Debhelper/Buildsystem/cmake.pm | 3 ++- Debian/Debhelper/Buildsystem/makefile.pm | 3 ++- Debian/Debhelper/Buildsystem/perl_build.pm | 3 ++- Debian/Debhelper/Buildsystem/perl_makemaker.pm | 3 ++- Debian/Debhelper/Buildsystem/python_distutils.pm | 3 ++- Debian/Debhelper/Buildsystem/qmake.pm | 2 +- Debian/Debhelper/Buildsystem/qmake_qt4.pm | 2 +- Debian/Debhelper/Dh_Getopt.pm | 3 ++- Debian/Debhelper/Dh_Lib.pm | 3 ++- dh | 3 ++- dh_auto_build | 3 ++- dh_auto_clean | 3 ++- dh_auto_configure | 3 ++- dh_auto_install | 3 ++- dh_auto_test | 3 ++- dh_bugfiles | 3 ++- dh_builddeb | 3 ++- dh_clean | 3 ++- dh_compress | 3 ++- dh_desktop | 3 ++- dh_fixperms | 3 ++- dh_gconf | 3 ++- dh_gencontrol | 3 ++- dh_icons | 3 ++- dh_install | 3 ++- dh_installcatalogs | 3 ++- dh_installchangelogs | 3 ++- dh_installcron | 3 ++- dh_installdeb | 3 ++- dh_installdebconf | 3 ++- dh_installdirs | 3 ++- dh_installdocs | 3 ++- dh_installemacsen | 3 ++- dh_installexamples | 3 ++- dh_installgsettings | 3 ++- dh_installifupdown | 3 ++- dh_installinfo | 3 ++- dh_installinit | 3 ++- dh_installlogcheck | 3 ++- dh_installlogrotate | 3 ++- dh_installman | 3 ++- dh_installmanpages | 3 ++- dh_installmenu | 3 ++- dh_installmime | 3 ++- dh_installmodules | 3 ++- dh_installpam | 3 ++- dh_installppp | 3 ++- dh_installudev | 3 ++- dh_installwm | 3 ++- dh_installxfonts | 3 ++- dh_link | 3 ++- dh_lintian | 3 ++- dh_listpackages | 3 ++- dh_makeshlibs | 3 ++- dh_md5sums | 3 ++- dh_movefiles | 3 ++- dh_perl | 3 ++- dh_prep | 3 ++- dh_scrollkeeper | 3 ++- dh_shlibdeps | 3 ++- dh_strip | 3 ++- dh_suidregister | 3 ++- dh_testdir | 3 ++- dh_testroot | 3 ++- dh_ucf | 3 ++- dh_undocumented | 3 ++- 68 files changed, 134 insertions(+), 68 deletions(-) (limited to 'dh_installcatalogs') diff --git a/Debian/Debhelper/Buildsystem/ant.pm b/Debian/Debhelper/Buildsystem/ant.pm index 212aa100..53eb0661 100644 --- a/Debian/Debhelper/Buildsystem/ant.pm +++ b/Debian/Debhelper/Buildsystem/ant.pm @@ -6,7 +6,8 @@ package Debian::Debhelper::Buildsystem::ant; use strict; -use base 'Debian::Debhelper::Buildsystem'; +use warnings; +use parent qw(Debian::Debhelper::Buildsystem); sub DESCRIPTION { "Ant (build.xml)" diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm index 005bcb53..62ff8b3a 100644 --- a/Debian/Debhelper/Buildsystem/autoconf.pm +++ b/Debian/Debhelper/Buildsystem/autoconf.pm @@ -7,8 +7,9 @@ package Debian::Debhelper::Buildsystem::autoconf; use strict; +use warnings; use Debian::Debhelper::Dh_Lib qw(dpkg_architecture_value sourcepackage compat); -use base 'Debian::Debhelper::Buildsystem::makefile'; +use parent qw(Debian::Debhelper::Buildsystem::makefile); sub DESCRIPTION { "GNU Autoconf (configure)" diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm index d60efd5d..9646d4b0 100644 --- a/Debian/Debhelper/Buildsystem/cmake.pm +++ b/Debian/Debhelper/Buildsystem/cmake.pm @@ -7,8 +7,9 @@ package Debian::Debhelper::Buildsystem::cmake; use strict; +use warnings; use Debian::Debhelper::Dh_Lib qw(compat); -use base 'Debian::Debhelper::Buildsystem::makefile'; +use parent qw(Debian::Debhelper::Buildsystem::makefile); sub DESCRIPTION { "CMake (CMakeLists.txt)" diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm index 79b063bc..7203349e 100644 --- a/Debian/Debhelper/Buildsystem/makefile.pm +++ b/Debian/Debhelper/Buildsystem/makefile.pm @@ -7,8 +7,9 @@ package Debian::Debhelper::Buildsystem::makefile; use strict; +use warnings; use Debian::Debhelper::Dh_Lib qw(escape_shell clean_jobserver_makeflags); -use base 'Debian::Debhelper::Buildsystem'; +use parent qw(Debian::Debhelper::Buildsystem); # make makes things difficult by not providing a simple way to test # whether a Makefile target exists. Using -n and checking for a nonzero diff --git a/Debian/Debhelper/Buildsystem/perl_build.pm b/Debian/Debhelper/Buildsystem/perl_build.pm index a9bc05db..39c79e2f 100644 --- a/Debian/Debhelper/Buildsystem/perl_build.pm +++ b/Debian/Debhelper/Buildsystem/perl_build.pm @@ -7,8 +7,9 @@ package Debian::Debhelper::Buildsystem::perl_build; use strict; +use warnings; use Debian::Debhelper::Dh_Lib qw(compat); -use base 'Debian::Debhelper::Buildsystem'; +use parent qw(Debian::Debhelper::Buildsystem); use Config; sub DESCRIPTION { diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm index bb93d67e..a98e9e9a 100644 --- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm +++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm @@ -7,8 +7,9 @@ package Debian::Debhelper::Buildsystem::perl_makemaker; use strict; +use warnings; use Debian::Debhelper::Dh_Lib qw(compat); -use base 'Debian::Debhelper::Buildsystem::makefile'; +use parent qw(Debian::Debhelper::Buildsystem::makefile); use Config; sub DESCRIPTION { diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm index c33cef82..0eef8f1e 100644 --- a/Debian/Debhelper/Buildsystem/python_distutils.pm +++ b/Debian/Debhelper/Buildsystem/python_distutils.pm @@ -8,9 +8,10 @@ package Debian::Debhelper::Buildsystem::python_distutils; use strict; +use warnings; use Cwd (); use Debian::Debhelper::Dh_Lib qw(error); -use base 'Debian::Debhelper::Buildsystem'; +use parent qw(Debian::Debhelper::Buildsystem); sub DESCRIPTION { "Python Distutils (setup.py)" diff --git a/Debian/Debhelper/Buildsystem/qmake.pm b/Debian/Debhelper/Buildsystem/qmake.pm index e1f7729b..21accb75 100644 --- a/Debian/Debhelper/Buildsystem/qmake.pm +++ b/Debian/Debhelper/Buildsystem/qmake.pm @@ -9,7 +9,7 @@ package Debian::Debhelper::Buildsystem::qmake; use strict; use warnings; use Debian::Debhelper::Dh_Lib qw(error); -use base 'Debian::Debhelper::Buildsystem::makefile'; +use parent qw(Debian::Debhelper::Buildsystem::makefile); our $qmake="qmake"; diff --git a/Debian/Debhelper/Buildsystem/qmake_qt4.pm b/Debian/Debhelper/Buildsystem/qmake_qt4.pm index b500a69d..f9c11f83 100644 --- a/Debian/Debhelper/Buildsystem/qmake_qt4.pm +++ b/Debian/Debhelper/Buildsystem/qmake_qt4.pm @@ -3,7 +3,7 @@ package Debian::Debhelper::Buildsystem::qmake_qt4; use strict; use warnings; use Debian::Debhelper::Dh_Lib qw(error); -use base 'Debian::Debhelper::Buildsystem::qmake'; +use parent qw(Debian::Debhelper::Buildsystem::qmake); sub DESCRIPTION { "qmake for QT 4 (*.pro)"; diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm index 93e489b5..c7d9c3cb 100644 --- a/Debian/Debhelper/Dh_Getopt.pm +++ b/Debian/Debhelper/Dh_Getopt.pm @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # # Debhelper option processing library. # @@ -6,6 +6,7 @@ package Debian::Debhelper::Dh_Getopt; use strict; +use warnings; use Debian::Debhelper::Dh_Lib; use Getopt::Long; diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 34bd33ed..f1953675 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # # Library functions for debhelper programs, perl version. # @@ -6,6 +6,7 @@ package Debian::Debhelper::Dh_Lib; use strict; +use warnings; use Exporter; use vars qw(@ISA @EXPORT %dh); diff --git a/dh b/dh index 93111da2..93855c6e 100755 --- a/dh +++ b/dh @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh - debhelper command sequencer =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_auto_build b/dh_auto_build index fdd9850e..f041e345 100755 --- a/dh_auto_build +++ b/dh_auto_build @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_auto_build - automatically builds a package =cut use strict; +use warnings; use Debian::Debhelper::Dh_Buildsystems; =head1 SYNOPSIS diff --git a/dh_auto_clean b/dh_auto_clean index 4125d799..7d239455 100755 --- a/dh_auto_clean +++ b/dh_auto_clean @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_auto_clean - automatically cleans up after a build =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; use Debian::Debhelper::Dh_Buildsystems; diff --git a/dh_auto_configure b/dh_auto_configure index d03cd8ab..33dc1fb7 100755 --- a/dh_auto_configure +++ b/dh_auto_configure @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_auto_configure - automatically configure a package prior to building =cut use strict; +use warnings; use Debian::Debhelper::Dh_Buildsystems; =head1 SYNOPSIS diff --git a/dh_auto_install b/dh_auto_install index afc9cf1a..9baab661 100755 --- a/dh_auto_install +++ b/dh_auto_install @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_auto_install - automatically runs make install or similar =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; use Debian::Debhelper::Dh_Buildsystems; use File::Spec; diff --git a/dh_auto_test b/dh_auto_test index 51967137..13dad9a0 100755 --- a/dh_auto_test +++ b/dh_auto_test @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_auto_test - automatically runs a package's test suites =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; use Debian::Debhelper::Dh_Buildsystems; diff --git a/dh_bugfiles b/dh_bugfiles index 81e36754..2fe9a11e 100755 --- a/dh_bugfiles +++ b/dh_bugfiles @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_bugfiles - install bug reporting customization files into package build direc =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_builddeb b/dh_builddeb index 37aef96c..e36f0a3b 100755 --- a/dh_builddeb +++ b/dh_builddeb @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_builddeb - build Debian binary packages =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_clean b/dh_clean index 0158e6e8..acb23dba 100755 --- a/dh_clean +++ b/dh_clean @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_clean - clean up package build directories =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_compress b/dh_compress index ee513228..1b33ac9a 100755 --- a/dh_compress +++ b/dh_compress @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_compress - compress files and fix symlinks in package build directories =cut use strict; +use warnings; use Cwd; use Debian::Debhelper::Dh_Lib; diff --git a/dh_desktop b/dh_desktop index 3af2cd58..7495eefc 100755 --- a/dh_desktop +++ b/dh_desktop @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_desktop - deprecated no-op =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_fixperms b/dh_fixperms index ce287854..90fbe3a9 100755 --- a/dh_fixperms +++ b/dh_fixperms @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_fixperms - fix permissions of files in package build directories =cut use strict; +use warnings; use Config; use Debian::Debhelper::Dh_Lib; diff --git a/dh_gconf b/dh_gconf index 0e13057d..d401c3ef 100755 --- a/dh_gconf +++ b/dh_gconf @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_gconf - install GConf defaults files and register schemas =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_gencontrol b/dh_gencontrol index ec2eeed6..f5944805 100755 --- a/dh_gencontrol +++ b/dh_gencontrol @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_gencontrol - generate and install control file =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_icons b/dh_icons index 58cf03f3..f2b6d7a4 100755 --- a/dh_icons +++ b/dh_icons @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_icons - Update caches of Freedesktop icons =cut use strict; +use warnings; use File::Find; use Debian::Debhelper::Dh_Lib; diff --git a/dh_install b/dh_install index e45ed380..7f8391e7 100755 --- a/dh_install +++ b/dh_install @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_install - install files into package build directories =cut use strict; +use warnings; use File::Find; use Debian::Debhelper::Dh_Lib; diff --git a/dh_installcatalogs b/dh_installcatalogs index de6a1387..d33ad9e0 100755 --- a/dh_installcatalogs +++ b/dh_installcatalogs @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installcatalogs - install and register SGML Catalogs =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; my $sgmlbasever = "1.26+nmu2"; diff --git a/dh_installchangelogs b/dh_installchangelogs index c83ac26f..b372d9b5 100755 --- a/dh_installchangelogs +++ b/dh_installchangelogs @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installchangelogs - install changelogs into package build directories =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installcron b/dh_installcron index 75837349..f91ef15f 100755 --- a/dh_installcron +++ b/dh_installcron @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installcron - install cron scripts into etc/cron.* =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installdeb b/dh_installdeb index 569b0a45..5d16921b 100755 --- a/dh_installdeb +++ b/dh_installdeb @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installdeb - install files into the DEBIAN directory =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installdebconf b/dh_installdebconf index 4a8ddf4a..686c7bca 100755 --- a/dh_installdebconf +++ b/dh_installdebconf @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installdebconf - install files used by debconf in package build directories =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installdirs b/dh_installdirs index d0646899..6797458f 100755 --- a/dh_installdirs +++ b/dh_installdirs @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installdirs - create subdirectories in package build directories =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installdocs b/dh_installdocs index aa6541ca..45b53385 100755 --- a/dh_installdocs +++ b/dh_installdocs @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installdocs - install documentation into package build directories =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installemacsen b/dh_installemacsen index a4884a5f..b56fb8b7 100755 --- a/dh_installemacsen +++ b/dh_installemacsen @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installemacsen - register an Emacs add on package =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installexamples b/dh_installexamples index 426e8009..c39e8996 100755 --- a/dh_installexamples +++ b/dh_installexamples @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installexamples - install example files into package build directories =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installgsettings b/dh_installgsettings index 66de51af..fcf4470e 100755 --- a/dh_installgsettings +++ b/dh_installgsettings @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installgsettings - install GSettings overrides and set dependencies =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installifupdown b/dh_installifupdown index 48e1c1af..3fdbaad4 100755 --- a/dh_installifupdown +++ b/dh_installifupdown @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installifupdown - install if-up and if-down hooks =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installinfo b/dh_installinfo index 5ecd428c..d12b0c0d 100755 --- a/dh_installinfo +++ b/dh_installinfo @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installinfo - install info files =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installinit b/dh_installinit index c4c8a921..579fc690 100755 --- a/dh_installinit +++ b/dh_installinit @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installinit - install service init files into package build directories =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; use File::Find; diff --git a/dh_installlogcheck b/dh_installlogcheck index 3c77bb75..72c92a38 100755 --- a/dh_installlogcheck +++ b/dh_installlogcheck @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installlogcheck - install logcheck rulefiles into etc/logcheck/ =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installlogrotate b/dh_installlogrotate index e6d274bb..9d7d554c 100755 --- a/dh_installlogrotate +++ b/dh_installlogrotate @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installlogrotate - install logrotate config files =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installman b/dh_installman index a467881a..135181a4 100755 --- a/dh_installman +++ b/dh_installman @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installman - install man pages into package build directories =cut use strict; +use warnings; use File::Find; use Debian::Debhelper::Dh_Lib; diff --git a/dh_installmanpages b/dh_installmanpages index a9f41e53..ade16047 100755 --- a/dh_installmanpages +++ b/dh_installmanpages @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installmanpages - old-style man page installer (deprecated) =cut use strict; +use warnings; use File::Find; use Debian::Debhelper::Dh_Lib; diff --git a/dh_installmenu b/dh_installmenu index a735a64c..3c1d84da 100755 --- a/dh_installmenu +++ b/dh_installmenu @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installmenu - install Debian menu files into package build directories =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installmime b/dh_installmime index 32d1d6a3..0b394ad0 100755 --- a/dh_installmime +++ b/dh_installmime @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installmime - install mime files into package build directories =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installmodules b/dh_installmodules index bdc8a24c..7197d0a3 100755 --- a/dh_installmodules +++ b/dh_installmodules @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installmodules - register kernel modules =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; use File::Find; diff --git a/dh_installpam b/dh_installpam index 47d558fb..2f73241e 100755 --- a/dh_installpam +++ b/dh_installpam @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installpam - install pam support files =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installppp b/dh_installppp index 82735c46..342591ae 100755 --- a/dh_installppp +++ b/dh_installppp @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installppp - install ppp ip-up and ip-down files =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installudev b/dh_installudev index 09399558..fa134ea9 100755 --- a/dh_installudev +++ b/dh_installudev @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installudev - install udev rules files =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; use File::Find; diff --git a/dh_installwm b/dh_installwm index 8fa0253f..a72e3c73 100755 --- a/dh_installwm +++ b/dh_installwm @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installwm - register a window manager =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_installxfonts b/dh_installxfonts index a02f6e00..bf48aafe 100755 --- a/dh_installxfonts +++ b/dh_installxfonts @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_installxfonts - register X fonts =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_link b/dh_link index 0e625a1e..f4ed64db 100755 --- a/dh_link +++ b/dh_link @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_link - create symlinks in package build directories =cut use strict; +use warnings; use File::Find; use Debian::Debhelper::Dh_Lib; diff --git a/dh_lintian b/dh_lintian index 555122ac..ffb16f65 100755 --- a/dh_lintian +++ b/dh_lintian @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_lintian - install lintian override files into package build directories =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_listpackages b/dh_listpackages index 3ddf110c..6da8b5af 100755 --- a/dh_listpackages +++ b/dh_listpackages @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_listpackages - list binary packages debhelper will act on =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_makeshlibs b/dh_makeshlibs index 2e012143..e567f8ef 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_makeshlibs - automatically create shlibs file and call dpkg-gensymbols =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_md5sums b/dh_md5sums index e2bc7245..9c925744 100755 --- a/dh_md5sums +++ b/dh_md5sums @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_md5sums - generate DEBIAN/md5sums file =cut use strict; +use warnings; use Cwd; use Debian::Debhelper::Dh_Lib; diff --git a/dh_movefiles b/dh_movefiles index 1803f455..547991c6 100755 --- a/dh_movefiles +++ b/dh_movefiles @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_movefiles - move files out of debian/tmp into subpackages =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_perl b/dh_perl index ea090653..a2306890 100755 --- a/dh_perl +++ b/dh_perl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_perl - calculates Perl dependencies and cleans up after MakeMaker =cut use strict; +use warnings; use Config; use File::Find; use Debian::Debhelper::Dh_Lib; diff --git a/dh_prep b/dh_prep index 759b0226..5ec7fae9 100755 --- a/dh_prep +++ b/dh_prep @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_prep - perform cleanups in preparation for building a binary package =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_scrollkeeper b/dh_scrollkeeper index b3a2f6e9..7badbd85 100755 --- a/dh_scrollkeeper +++ b/dh_scrollkeeper @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_scrollkeeper - deprecated no-op =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_shlibdeps b/dh_shlibdeps index 97109e3a..c47bd15b 100755 --- a/dh_shlibdeps +++ b/dh_shlibdeps @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_shlibdeps - calculate shared library dependencies =cut use strict; +use warnings; use Cwd; use Debian::Debhelper::Dh_Lib; diff --git a/dh_strip b/dh_strip index 00857527..91197abb 100755 --- a/dh_strip +++ b/dh_strip @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_strip - strip executables, shared libraries, and some static libraries =cut use strict; +use warnings; use File::Find; use Debian::Debhelper::Dh_Lib; diff --git a/dh_suidregister b/dh_suidregister index c17f905b..020e9a0e 100755 --- a/dh_suidregister +++ b/dh_suidregister @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -31,6 +31,7 @@ program from your rules file. =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; init(); diff --git a/dh_testdir b/dh_testdir index 0459c873..ed576e27 100755 --- a/dh_testdir +++ b/dh_testdir @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_testdir - test directory before building Debian package =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_testroot b/dh_testroot index 61700b4c..6b2c7382 100755 --- a/dh_testroot +++ b/dh_testroot @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -17,6 +17,7 @@ L =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; inhibit_log(); diff --git a/dh_ucf b/dh_ucf index 811bd209..409e9503 100755 --- a/dh_ucf +++ b/dh_ucf @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_ucf - register configuration files with ucf =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS diff --git a/dh_undocumented b/dh_undocumented index 661864a0..101596e4 100755 --- a/dh_undocumented +++ b/dh_undocumented @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl =head1 NAME @@ -7,6 +7,7 @@ dh_undocumented - undocumented.7 symlink program (deprecated no-op) =cut use strict; +use warnings; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS -- cgit v1.2.3