[Reproducible-commits] [debhelper] 39/61: dh_installdocs: Use ${binary:Version} in substvars w. --link-doc

[Mattia Rizzolo]

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

mapreri-guest pushed a commit to branch pu/reproducible_builds
in repository debhelper.

commit 91636c41fe091ea54e1c2c2516ee431ec0332685
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Jan 8 21:04:05 2015 +0100

    dh_installdocs: Use ${binary:Version} in substvars w. --link-doc
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 4 ++++
 dh_installdocs   | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27969ae..ef51ced 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,10 @@ debhelper (9.20150101.1) UNRELEASED; urgency=medium
   * dh_gconf: Apply patch from Martin Koeppe to avoid adding a layer
     of shell-escaping to a printed command line when the command was
     in fact run without said layet of shell-escaping.
+  * dh_installdocs: Use ${binary:Version} for generating dependencies
+    with "--link-doc" instead of trying to determine the correct
+    package version.  Thanks to Stephen Kitt for reporting this
+    issue.  (Closes: #747141)
 
   [ Bernhard R. Link ]
   * Dh_lib: apply patch from Guillem Jover to support case-insensitive
diff --git a/dh_installdocs b/dh_installdocs
index 93ceaf1..b35db6a 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -186,13 +186,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		if (! -d "$tmp/usr/share/doc/$package" &&
 		    ! -l "$tmp/usr/share/doc/$package") {
 			doit("ln", "-sf", $dh{LINK_DOC}, "$tmp/usr/share/doc/$package");
-			# Call isnative because it sets $dh{VERSION}
-			# as a side effect.
-			isnative($dh{LINK_DOC});
 			# Policy says that if you make your documentation
 			# directory a symlink, then you have to depend on
 			# the target.
-			addsubstvar($package, "misc:Depends", "$dh{LINK_DOC} (= $dh{VERSION})");
+			addsubstvar($package, 'misc:Depends', "$dh{LINK_DOC} (= \${binary:Version})");
 		}
 	}
 	else {

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