summaryrefslogtreecommitdiff
path: root/dh_installdeb
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-10-25 14:40:29 -0400
committerJoey Hess <joey@kitenet.net>2012-10-25 14:40:29 -0400
commit0bccbeee4e1e13fcd3553fcd7eabd9b3a7695690 (patch)
treef4a7e6cfb309eb1be5a769bd728680472df3f62a /dh_installdeb
parentf79ed4ddd81b299fe9b7aab55c0ef01b89989910 (diff)
dh_installdeb: Avoid unnecessary is_udeb tests. Closes: #691398
Diffstat (limited to 'dh_installdeb')
-rwxr-xr-xdh_installdeb18
1 files changed, 9 insertions, 9 deletions
diff --git a/dh_installdeb b/dh_installdeb
index def76d1..bc4091b 100755
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -93,7 +93,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
$f, "$tmp/DEBIAN/$script");
}
}
- next;
+
+ # stop here for udebs
+ next;
}
my $maintscriptfile=pkgfile($package, "maintscript");
@@ -117,19 +119,17 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
debhelper_script_subst($package, $script);
}
- if (! is_udeb($package)) {
- # Install non-executable files
- 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 non-executable files
+ 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");
}
}
# Automatic conffiles registration: If it is in /etc, it is a
# conffile.
- if (! compat(2) && -d "$tmp/etc" && ! is_udeb($package)) {
+ if (! compat(2) && -d "$tmp/etc") {
complex_doit("find $tmp/etc -type f -printf '/etc/%P\n' >> $tmp/DEBIAN/conffiles");
# Anything found?
if (-z "$tmp/DEBIAN/conffiles") {