diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-07-16 17:23:03 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-07-16 17:23:03 +0300 |
| commit | ba9650393d006d3f97d15d5b1a4672ff73c69cde (patch) | |
| tree | b6735c3074843ccca8cc45896ba90c80b1d53ce6 /dh_installcatalogs | |
| parent | 75823a821e471d214d4b364ae12f0ae165378626 (diff) | |
| parent | 6293fc37272918145be041c48cc56874a84a7bd9 (diff) | |
| download | debhelper-ba9650393d006d3f97d15d5b1a4672ff73c69cde.tar.gz | |
Merge git://anonscm.debian.org/debhelper/debhelper
Conflicts:
debian/changelog
dh
Diffstat (limited to 'dh_installcatalogs')
| -rwxr-xr-x | dh_installcatalogs | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/dh_installcatalogs b/dh_installcatalogs index f65ab7cb..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"; @@ -83,11 +84,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 +96,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"; @@ -130,3 +131,9 @@ F</usr/share/doc/sgml-base-doc/> Adam Di Carlo <aph@debian.org> =cut + +# Local Variables: +# indent-tabs-mode: t +# tab-width: 4 +# cperl-indent-level: 4 +# End: |