diff options
| author | Niels Thykier <niels@thykier.net> | 2019-08-17 15:02:48 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2019-08-17 15:05:06 +0000 |
| commit | a9c14ab96bd485f0abf3e45970fdd1053077be6a (patch) | |
| tree | 742256dbd7b18dd0f75bafc811b35a29777cb0e6 | |
| parent | e6516b5f5b05106c4d34fc2eae6a185c01295864 (diff) | |
| download | debhelper-a9c14ab96bd485f0abf3e45970fdd1053077be6a.tar.gz | |
dh_makeshlibs: Fix bug in handling of -X
Signed-off-by: Niels Thykier <niels@thykier.net>
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | dh_makeshlibs | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 0b10aefb..88882b75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ debhelper (12.5.1) UNRELEASED; urgency=medium a valid character for package names. * dh_installdeb: Reject invalid token names passed to -D or --define (in most cases). + * dh_makeshlibs: Fix bug in -X where it would no longer match + as expected. A regression since 12.5 - thanks to Aurelien + Jarno for reporting the issue over IRC. -- Niels Thykier <niels@thykier.net> Sat, 17 Aug 2019 12:40:56 +0000 diff --git a/dh_makeshlibs b/dh_makeshlibs index e8b27445..fbb5f4ce 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -227,8 +227,9 @@ sub _all_so_files { # Only real/regular files -l && return; -f _ || return; - return if not is_so_or_exec_elf_file($_) or excludefile($_); my $path = "$File::Find::dir/$_"; + return if excludefile($path); + return if not is_so_or_exec_elf_file($_); push(@all_so_files, $path); }, $root_dir); |