diff options
| author | Niels Thykier <niels@thykier.net> | 2017-05-26 06:04:26 (GMT) |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2017-05-26 06:04:26 (GMT) |
| commit | cb5054c507c0c76d1c47ce5f55605586e57405bf (patch) | |
| tree | 74cf4e34a88b972696e4e52507cc0fded764514f | |
| parent | 7dd8f2c09a949c0318fd2b9ea5419f671c921088 (diff) | |
Dh_Lib: Fix bug in dh's internal pkgfile API
Signed-off-by: Niels Thykier <niels@thykier.net>
| -rw-r--r-- | Debian/Debhelper/Dh_Lib.pm | 6 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 380a14d..fb5752d 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -560,11 +560,11 @@ sub tmpdir { # is NOT useful for finding the most precise pkgfile. push(@try, "debian/$filename"); for my $pkg (@{$package}) { - push(@try, "debian/$package.$filename"); + push(@try, "debian/${pkg}.${filename}"); if ($check_expensive) { push(@try, - "debian/${package}.${filename}.".buildarch(), - "debian/${package}.${filename}.".buildos(), + "debian/${pkg}.${filename}.".buildarch(), + "debian/${pkg}.${filename}.".buildos(), ); } } diff --git a/debian/changelog b/debian/changelog index d8d9b5c..1b9c596 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ debhelper (10.4) UNRELEASED; urgency=medium on the cmd-line. * dh_missing: Accept --sourcedir (given it is passed by dh_install). (Closes: #862049) + * Dh_Lib.pm: Fix a bug in pkgfile that caused dh to skip helpers + that had configuration files. Thanks to Michael Biebl for finding + and reporting. (Closes: #863387) [ Chris Lamb ] * dh_fixperms: Fix regression where dh_fixperms would fail to correct |