diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | dh_compress | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 3bf2ddec..5d977670 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ debhelper (12.2) UNRELEASED; urgency=medium * dh_installinitramfs: Install hooks as executable rather than plan files. Thanks to Thorsten Glaser for the report. (Closes: #922990) + * dh_compress: Fix bug where examples where compressed when a + doc package shipped examples for another package. Thanks to + Christian Kastner for reporting this. (Closes: #922267) -- Niels Thykier <niels@thykier.net> Sat, 23 Feb 2019 07:40:46 +0000 diff --git a/dh_compress b/dh_compress index abba978d..d801d833 100755 --- a/dh_compress +++ b/dh_compress @@ -91,7 +91,12 @@ on_pkgs_in_parallel { # structure that will be effected. next unless -d $tmp; my $ignore_doc_dirs = '-name _sources'; - $ignore_doc_dirs .= qq{ -o -path "usr/share/doc/$package/examples"} if not compat(11); + if (not compat(11)) { + my $target_package = compute_doc_main_package($package); + $ignore_doc_dirs .= qq{ -o -path "usr/share/doc/${package}/examples"}; + $ignore_doc_dirs .= qq{ -o -path "usr/share/doc/${target_package}/examples"} + if $target_package and $target_package ne $package; + } $olddir = getcwd() if not defined $olddir; verbose_print("cd $tmp"); chdir($tmp) || error("Can't cd to $tmp: $!"); |