[debhelper-devel] [debhelper] 01/01: dh_compress: Remove target before creating fixup symlink

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 1b2f59ad1a9d9748d6e30e16ce41251ffcaadc50
Author: Sven Joachim <svenjoac at gmx.de>
Date:   Sat Jul 1 16:52:52 2017 +0200

    dh_compress: Remove target before creating fixup symlink
    
    The target might already exist, possible because it had been created
    by dh_link before.
    
    Regression introduced by the switch to make_symlink_raw_target in
    commit ee8fd59af61fa4739cdd536ecbb492cc8520df40.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 dh_compress      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0723b27..385a33a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debhelper (10.6.2) UNRELEASED; urgency=medium
 
   * Refactor test suite and support running tests in parallel.
   * Add a test case for #866570.
+  * dh_compress: Apply patch from Sven Joachim to fix a
+    regression in 10.5.1.  (Closes: #866713)
 
  -- Niels Thykier <niels at thykier.net>  Mon, 03 Jul 2017 14:39:11 +0000
 
diff --git a/dh_compress b/dh_compress
index 89c23f8..21503c6 100755
--- a/dh_compress
+++ b/dh_compress
@@ -212,7 +212,7 @@ on_pkgs_in_parallel {
 				my ($directory) = $link =~ m:(.*)/:;
 				my $linkval = readlink($link);
 				if (! -e "$directory/$linkval" && -e "$directory/$linkval.gz") {
-					rm_files($link);
+					rm_files($link, "$link.gz");
 					make_symlink_raw_target("$linkval.gz","$link.gz");
 					delete $links{$link};
 					$changed++;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git